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/sess.c | |
parent | 13b1c3d4b49bd83d861c775ca2db54e1692a1b07 (diff) | |
parent | 966ea8c4b74aa6fde2d58c50a904619fd849ae93 (diff) | |
download | kernel_samsung_smdk4412-a6c0e1f71d37b89c883d636eca48a017c055c8c4.zip kernel_samsung_smdk4412-a6c0e1f71d37b89c883d636eca48a017c055c8c4.tar.gz kernel_samsung_smdk4412-a6c0e1f71d37b89c883d636eca48a017c055c8c4.tar.bz2 |
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/sess.c')
-rw-r--r-- | fs/cifs/sess.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index d2153ab..ed150ef 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -417,10 +417,6 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, calc_lanman_hash(ses, lnm_session_key); ses->flags |= CIFS_SES_LANMAN; -/* #ifdef CONFIG_CIFS_DEBUG2 - cifs_dump_mem("cryptkey: ",ses->server->cryptKey, - CIFS_SESS_KEY_SIZE); -#endif */ memcpy(bcc_ptr, (char *)lnm_session_key, CIFS_SESS_KEY_SIZE); bcc_ptr += CIFS_SESS_KEY_SIZE; |