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] Fix reversed memset arguments
  Adds username in the upcall key for unattended mounts with keytab
  [CIFS] Remove redundant NULL check

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 00ced97bd53a..129dbfe4dca7 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -172,7 +172,7 @@ static void fill_fake_finddataunix(FILE_UNIX_BASIC_INFO *pfnd_dat,
 {
         struct inode *pinode = NULL;
 
-        memset(pfnd_dat, sizeof(FILE_UNIX_BASIC_INFO), 0);
+        memset(pfnd_dat, 0, sizeof(FILE_UNIX_BASIC_INFO));
 
 /*      __le64 pfnd_dat->EndOfFile = cpu_to_le64(0);
         __le64 pfnd_dat->NumOfBytes = cpu_to_le64(0);
@@ -384,7 +384,7 @@ static int get_sfu_mode(struct inode *inode,
 static void fill_fake_finddata(FILE_ALL_INFO *pfnd_dat,
                                struct super_block *sb)
 {
-        memset(pfnd_dat, sizeof(FILE_ALL_INFO), 0);
+        memset(pfnd_dat, 0, sizeof(FILE_ALL_INFO));
 
 /*      __le64 pfnd_dat->AllocationSize = cpu_to_le64(0);
         __le64 pfnd_dat->EndOfFile = cpu_to_le64(0);