diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 10:37:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 10:37:27 -0700 |
| commit | b4020c1b198c0f0c0b0ff0cfdd824a26b93edd6f (patch) | |
| tree | f2d0dcca7bae865606e90ffc2599c993da1a888f /fs/cifs/cifsfs.c | |
| parent | 435f49a518c78eec8e2edbbadd912737246cbe20 (diff) | |
| parent | d3686d54c7902a303bd65d751226aa1647319863 (diff) | |
| download | linux-3.10-b4020c1b198c0f0c0b0ff0cfdd824a26b93edd6f.tar.gz linux-3.10-b4020c1b198c0f0c0b0ff0cfdd824a26b93edd6f.tar.bz2 linux-3.10-b4020c1b198c0f0c0b0ff0cfdd824a26b93edd6f.zip | |
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: Cleanup and thus reduce smb session structure and fields used during authentication
NTLM auth and sign - Use appropriate server challenge
cifs: add kfree() on error path
NTLM auth and sign - minor error corrections and cleanup
NTLM auth and sign - Use kernel crypto apis to calculate hashes and smb signatures
NTLM auth and sign - Define crypto hash functions and create and send keys needed for key exchange
cifs: cifs_convert_address() returns zero on error
NTLM auth and sign - Allocate session key/client response dynamically
cifs: update comments - [s/GlobalSMBSesLock/cifs_file_list_lock/g]
cifs: eliminate cifsInodeInfo->write_behind_rc (try #6)
[CIFS] Fix checkpatch warnings and bump cifs version number
cifs: wait for writeback to complete in cifs_flush
cifs: convert cifsFileInfo->count to non-atomic counter
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 8bd5c2c243a..75c4eaa7958 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -318,7 +318,6 @@ cifs_alloc_inode(struct super_block *sb) return NULL; cifs_inode->cifsAttrs = 0x20; /* default */ cifs_inode->time = 0; - cifs_inode->write_behind_rc = 0; /* Until the file is open and we have gotten oplock info back from the server, can not assume caching of file data or metadata */ |