diff options
| author | Pavel Shilovsky <pshilovsky@samba.org> | 2014-08-26 19:04:44 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-09-17 22:54:13 +0200 |
| commit | 825196496f0fb1f575fcff42b5923cdc68333d0f (patch) | |
| tree | 410939413eb8b496f13f59f1fba51c7290f8b05c /fs/cifs | |
| parent | 47770ac167aec89d4743afee133ef9f6609ce768 (diff) | |
| download | lwn-825196496f0fb1f575fcff42b5923cdc68333d0f.tar.gz lwn-825196496f0fb1f575fcff42b5923cdc68333d0f.zip | |
CIFS: Fix wrong restart readdir for SMB1
commit f736906a7669a77cf8cabdcbcf1dc8cb694e12ef upstream.
The existing code calls server->ops->close() that is not
right. This causes XFS test generic/310 to fail. Fix this
by using server->ops->closedir() function.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/readdir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 5940ecabbe6a..59edb8fd33aa 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -596,8 +596,8 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos, if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) { cfile->invalidHandle = true; spin_unlock(&cifs_file_list_lock); - if (server->ops->close) - server->ops->close(xid, tcon, &cfile->fid); + if (server->ops->close_dir) + server->ops->close_dir(xid, tcon, &cfile->fid); } else spin_unlock(&cifs_file_list_lock); if (cfile->srch_inf.ntwrk_buf_start) { |