Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* 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

Linus Torvalds 18 years ago 75d3bce2 a0abb93b

+11 -14

3 changed files

expand all

cifs

cifs_spnego.c

cifssmb.c

inode.c

fs/cifs/cifs_spnego.c

··· 119 119 dp = description + strlen(description); 120 120 sprintf(dp, ";uid=0x%x", sesInfo->linux_uid); 121 121 122 + dp = description + strlen(description); 123 + sprintf(dp, ";user=%s", sesInfo->userName); 124 + 122 125 cFYI(1, ("key description = %s", description)); 123 126 spnego_key = request_key(&cifs_spnego_key_type, description, ""); 124 127

+6 -12

fs/cifs/cifssmb.c

··· 2159 2159 cFYI(1, ("Send error in copy = %d with %d files copied", 2160 2160 rc, le16_to_cpu(pSMBr->CopyCount))); 2161 2161 } 2162 - if (pSMB) 2163 - cifs_buf_release(pSMB); 2162 + cifs_buf_release(pSMB); 2164 2163 2165 2164 if (rc == -EAGAIN) 2166 2165 goto copyRetry; ··· 2248 2249 if (rc) 2249 2250 cFYI(1, ("Send error in SetPathInfo create symlink = %d", rc)); 2250 2251 2251 - if (pSMB) 2252 - cifs_buf_release(pSMB); 2252 + cifs_buf_release(pSMB); 2253 2253 2254 2254 if (rc == -EAGAIN) 2255 2255 goto createSymLinkRetry; ··· 4093 4095 target_nodes, nls_codepage); 4094 4096 4095 4097 GetDFSRefExit: 4096 - if (pSMB) 4097 - cifs_buf_release(pSMB); 4098 + cifs_buf_release(pSMB); 4098 4099 4099 4100 if (rc == -EAGAIN) 4100 4101 goto getDFSRetry; ··· 5114 5117 if (rc) 5115 5118 cFYI(1, ("SetPathInfo (perms) returned %d", rc)); 5116 5119 5117 - if (pSMB) 5118 - cifs_buf_release(pSMB); 5120 + cifs_buf_release(pSMB); 5119 5121 if (rc == -EAGAIN) 5120 5122 goto setPermsRetry; 5121 5123 return rc; ··· 5336 5340 } 5337 5341 } 5338 5342 } 5339 - if (pSMB) 5340 - cifs_buf_release(pSMB); 5343 + cifs_buf_release(pSMB); 5341 5344 if (rc == -EAGAIN) 5342 5345 goto QAllEAsRetry; 5343 5346 ··· 5485 5490 } 5486 5491 } 5487 5492 } 5488 - if (pSMB) 5489 - cifs_buf_release(pSMB); 5493 + cifs_buf_release(pSMB); 5490 5494 if (rc == -EAGAIN) 5491 5495 goto QEARetry; 5492 5496

+2 -2

fs/cifs/inode.c

··· 172 172 { 173 173 struct inode *pinode = NULL; 174 174 175 - memset(pfnd_dat, sizeof(FILE_UNIX_BASIC_INFO), 0); 175 + memset(pfnd_dat, 0, sizeof(FILE_UNIX_BASIC_INFO)); 176 176 177 177 /* __le64 pfnd_dat->EndOfFile = cpu_to_le64(0); 178 178 __le64 pfnd_dat->NumOfBytes = cpu_to_le64(0); ··· 384 384 static void fill_fake_finddata(FILE_ALL_INFO *pfnd_dat, 385 385 struct super_block *sb) 386 386 { 387 - memset(pfnd_dat, sizeof(FILE_ALL_INFO), 0); 387 + memset(pfnd_dat, 0, sizeof(FILE_ALL_INFO)); 388 388 389 389 /* __le64 pfnd_dat->AllocationSize = cpu_to_le64(0); 390 390 __le64 pfnd_dat->EndOfFile = cpu_to_le64(0);