diff options
author | Mark Brown <broonie@kernel.org> | 2014-10-02 16:53:35 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-02 16:53:35 +0100 |
commit | 04a0b8ef6b27c2b6280dcbfcdd418b7d851f8491 (patch) | |
tree | 062e082e19ab94a4ca7bc60286df970debdd2d6f /fs/cifs/file.c | |
parent | 9810f5370b6e60c4b564f294feb51761f0e741f6 (diff) | |
parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) |
Merge tag 'v3.17-rc4' into asoc-simple
Linux 3.17-rc4
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r-- | fs/cifs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 4ab2f79ffa7a..d5fec92e0360 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -762,7 +762,7 @@ int cifs_closedir(struct inode *inode, struct file *file) cifs_dbg(FYI, "Freeing private data in close dir\n"); spin_lock(&cifs_file_list_lock); - if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) { + if (server->ops->dir_needs_close(cfile)) { cfile->invalidHandle = true; spin_unlock(&cifs_file_list_lock); if (server->ops->close_dir) |