diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-11-20 20:00:44 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-11-20 20:14:13 +0000 |
| commit | ddb4cbfc53aa0913ee8da059fcbf628d14f40f63 (patch) | |
| tree | d77a2d510fa3a3b6556052af024355ed5cfc43d8 /fs/cifs/readdir.c | |
| parent | bfb59820ee46616a7bdb4af6b8f7e109646de6ec (diff) | |
| download | lwn-ddb4cbfc53aa0913ee8da059fcbf628d14f40f63.tar.gz lwn-ddb4cbfc53aa0913ee8da059fcbf628d14f40f63.zip | |
[CIFS] Do not attempt to close invalidated file handles
If a connection with open file handles has gone down
and come back up and reconnected without reopening
the file handle yet, do not attempt to send an SMB close
request for this handle in cifs_close. We were
checking for the connection being invalid in cifs_close
but since the connection may have been reconnected
we also need to check whether the file handle
was marked invalid (otherwise we could close the
wrong file handle by accident).
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/readdir.c')
| -rw-r--r-- | fs/cifs/readdir.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 58d57299f2a0..9f51f9bf0292 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -741,11 +741,14 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon, (index_to_find < first_entry_in_buffer)) { /* close and restart search */ cFYI(1, ("search backing up - close and restart search")); + write_lock(&GlobalSMBSeslock); if (!cifsFile->srch_inf.endOfSearch && !cifsFile->invalidHandle) { cifsFile->invalidHandle = true; + write_unlock(&GlobalSMBSeslock); CIFSFindClose(xid, pTcon, cifsFile->netfid); - } + } else + write_unlock(&GlobalSMBSeslock); if (cifsFile->srch_inf.ntwrk_buf_start) { cFYI(1, ("freeing SMB ff cache buf on search rewind")); if (cifsFile->srch_inf.smallBuf) |