public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: "Steve French" <smfrench@gmail•com>
To: Greg KH <gregkh@suse•de>
Cc: Randy Dunlap <randy.dunlap@oracle•com>,
	Stephen Rothwell <sfr@canb•auug.org.au>,
	linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
	sfrench@samba•org
Subject: Re: linux-next: Tree for January 12 (cifs vs. staging)
Date: Mon, 12 Jan 2009 15:07:48 -0600	[thread overview]
Message-ID: <524f69650901121307v67047946yed2c56efaaa839a1@mail.gmail.com> (raw)
In-Reply-To: <20090112191330.GC7111@suse.de>

On Mon, Jan 12, 2009 at 1:13 PM, Greg KH <gregkh@suse•de> wrote:
> On Mon, Jan 12, 2009 at 12:58:42PM -0600, Steve French wrote:
>> There is not just the cifs md5 one (which has been around a long
>> time), but an md5_init (static) in crypto and the new one in rt.  The
>> addition of the new one (rt md5_init) causes the build problem.   It
>> would be nice if we could use the same md5 routines though ... last
>> time we checked the crypto one was not well suited for calculating
>> signatures as a network fs would do though.
>
> I'll fix up the staging rt drivers to not do this, but cifs shouldn't be
> declaring such functions as globals either :)

I have changed the names of cifs's md5 functions in the cifs-2.6.git tree

diff --git a/fs/cifs/md5.h b/fs/cifs/md5.h
index f7d4f41..6fba8cb 100644
--- a/fs/cifs/md5.h
+++ b/fs/cifs/md5.h
@@ -20,10 +20,10 @@ struct HMACMD5Context {
 };
 #endif				/* _HMAC_MD5_H */

-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, unsigned char const *buf,
+void cifs_MD5_init(struct MD5Context *context);
+void cifs_MD5_update(struct MD5Context *context, unsigned char const *buf,
 			unsigned len);
-void MD5Final(unsigned char digest[16], struct MD5Context *context);
+void cifs_MD5_final(unsigned char digest[16], struct MD5Context *context);




-- 
Thanks,

Steve

  parent reply	other threads:[~2009-01-12 21:07 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-12  4:45 linux-next: Tree for January 12 Stephen Rothwell
2009-01-12 18:19 ` linux-next: Tree for January 12 (cifs vs. staging) Randy Dunlap
2009-01-12 18:58   ` Steve French
2009-01-12 19:13     ` Greg KH
2009-01-12 19:23       ` Steve French
2009-01-12 19:32         ` Greg KH
2009-01-12 20:13           ` Steve French
2009-01-12 20:21             ` Greg KH
2009-01-12 20:40               ` Steve French
2009-01-12 21:07       ` Steve French [this message]
2009-01-13  2:01         ` Valdis.Kletnieks
2009-01-13  2:27           ` Dave Kleikamp
2009-01-13  2:35             ` Valdis.Kletnieks
2009-01-12 19:19     ` Dave Kleikamp
2009-01-12 19:23       ` Greg KH
2009-01-12 19:35       ` Steve French
2009-01-12 18:50 ` [PATCH -next] libfc: needs CRC32 Randy Dunlap
2009-01-13  0:05   ` Love, Robert W
2009-01-12 18:53 ` [PATCH -next] scsi_debug: needs CRC_T10DIF Randy Dunlap
2009-01-13  3:26   ` Martin K. Petersen
2009-01-12 19:08 ` linux-next: Tree for January 12 (afs/fscache) Randy Dunlap
  -- strict thread matches above, loose matches on Subject: below --
2009-01-13  6:35 linux-next: Tree for January 12 (cifs vs. staging) Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=524f69650901121307v67047946yed2c56efaaa839a1@mail.gmail.com \
    --to=smfrench@gmail$(echo .)com \
    --cc=gregkh@suse$(echo .)de \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=randy.dunlap@oracle$(echo .)com \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=sfrench@samba$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox