diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 10:10:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 10:10:35 -0700 |
| commit | 07e2e6ba2761291aa182993ebba1f490b5005dcc (patch) | |
| tree | 4179e6189472f3a2434bb5cae01ec8f694881955 /fs/cifs/connect.c | |
| parent | d8f654ef6a55495e548427b997a388e0d5a1ffb4 (diff) | |
| parent | 3321b791b2e8897323f8c044a0c77ff25781381c (diff) | |
| download | talos-op-linux-07e2e6ba2761291aa182993ebba1f490b5005dcc.tar.gz talos-op-linux-07e2e6ba2761291aa182993ebba1f490b5005dcc.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: fix locking and list handling code in cifs_open and its helper
[CIFS] Remove build warning
cifs: fix problems with last two commits
[CIFS] Fix build break when keys support turned off
cifs: eliminate cifs_init_private
cifs: convert oplock breaks to use slow_work facility (try #4)
cifs: have cifsFileInfo hold an extra inode reference
cifs: take read lock on GlobalSMBSes_lock in is_valid_oplock_break
cifs: remove cifsInodeInfo.oplockPending flag
cifs: fix oplock request handling in posix codepath
[CIFS] Re-enable Lanman security
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index d49682433c20..43003e0bef18 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1670,7 +1670,6 @@ cifs_put_tcon(struct cifsTconInfo *tcon) CIFSSMBTDis(xid, tcon); _FreeXid(xid); - DeleteTconOplockQEntries(tcon); tconInfoFree(tcon); cifs_put_smb_ses(ses); } |
