diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 08:00:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 08:00:34 -0800 |
| commit | a6c0e1f71d37b89c883d636eca48a017c055c8c4 (patch) | |
| tree | 58e58534340551eefbf4c5f3467dc10c20410381 /fs/cifs/md4.c | |
| parent | 13b1c3d4b49bd83d861c775ca2db54e1692a1b07 (diff) | |
| parent | 966ea8c4b74aa6fde2d58c50a904619fd849ae93 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] remove unused variable
[CIFS] consolidate duplicate code in posix/unix inode handling
[CIFS] fix build break when proc disabled
[CIFS] factoring out common code in get_inode_info functions
[CIFS] fix prepath conversion when server supports posix paths
[CIFS] Only convert / when server does not support posix paths
[CIFS] Fix mixed case name in structure dfs_info3_param
[CIFS] fixup prefixpaths which contain multiple path components
[CIFS] fix typo
[CIFS] patch to fix incorrect encoding of number of aces on set mode
[CIFS] Fix typo in quota operations
[CIFS] clean up some hard to read ifdefs
[CIFS] reduce checkpatch warnings
[CIFS] fix warning in cifs_spnego.c
Diffstat (limited to 'fs/cifs/md4.c')
| -rw-r--r-- | fs/cifs/md4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/md4.c b/fs/cifs/md4.c index a2415c1a14d..a725c2609d6 100644 --- a/fs/cifs/md4.c +++ b/fs/cifs/md4.c @@ -56,7 +56,7 @@ lshift(__u32 x, int s) /* this applies md4 to 64 byte chunks */ static void -mdfour64(__u32 * M, __u32 * A, __u32 *B, __u32 * C, __u32 *D) +mdfour64(__u32 *M, __u32 *A, __u32 *B, __u32 *C, __u32 *D) { int j; __u32 AA, BB, CC, DD; @@ -137,7 +137,7 @@ mdfour64(__u32 * M, __u32 * A, __u32 *B, __u32 * C, __u32 *D) } static void -copy64(__u32 * M, unsigned char *in) +copy64(__u32 *M, unsigned char *in) { int i; |