summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorPavel Shilovsky <pshilovsky@samba.org>2014-08-26 19:04:44 +0400
committerSteve French <smfrench@gmail.com>2014-08-25 16:44:28 -0500
commitf736906a7669a77cf8cabdcbcf1dc8cb694e12ef (patch)
tree245524ab7b74c560b777b0589f0af9e2f66ef066 /fs/cifs
parenta07d322059db66b84c9eb4f98959df468e88b34b (diff)
downloadop-kernel-dev-f736906a7669a77cf8cabdcbcf1dc8cb694e12ef.zip
op-kernel-dev-f736906a7669a77cf8cabdcbcf1dc8cb694e12ef.tar.gz
CIFS: Fix wrong restart readdir for SMB1
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. Cc: <stable@vger.kernel.org> # v3.7+ 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>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/readdir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 798c80a..b334a89 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 (server->ops->dir_needs_close(cfile)) {
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) {
OpenPOWER on IntegriCloud