diff options
| author | Pavel Shilovsky <pshilovsky@samba.org> | 2014-08-26 11:04:44 -0400 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2014-08-25 17:44:28 -0400 |
| commit | f736906a7669a77cf8cabdcbcf1dc8cb694e12ef (patch) | |
| tree | 245524ab7b74c560b777b0589f0af9e2f66ef066 /fs/cifs/readdir.c | |
| parent | a07d322059db66b84c9eb4f98959df468e88b34b (diff) | |
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/readdir.c')
| -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 798c80a41c88..b334a89d6a66 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, | |||
| 596 | if (server->ops->dir_needs_close(cfile)) { | 596 | if (server->ops->dir_needs_close(cfile)) { |
| 597 | cfile->invalidHandle = true; | 597 | cfile->invalidHandle = true; |
| 598 | spin_unlock(&cifs_file_list_lock); | 598 | spin_unlock(&cifs_file_list_lock); |
| 599 | if (server->ops->close) | 599 | if (server->ops->close_dir) |
| 600 | server->ops->close(xid, tcon, &cfile->fid); | 600 | server->ops->close_dir(xid, tcon, &cfile->fid); |
| 601 | } else | 601 | } else |
| 602 | spin_unlock(&cifs_file_list_lock); | 602 | spin_unlock(&cifs_file_list_lock); |
| 603 | if (cfile->srch_inf.ntwrk_buf_start) { | 603 | if (cfile->srch_inf.ntwrk_buf_start) { |