CIFS: Move readdir code to ops struct

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 34 insertions, 26 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 39fff77e38d4..fb6b4413255b 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -618,39 +618,47 @@ int cifs_closedir(struct inode *inode, struct file *file)
         int rc = 0;
         unsigned int xid;
         struct cifsFileInfo *cfile = file->private_data;
-        char *tmp;
+        struct cifs_tcon *tcon;
+        struct TCP_Server_Info *server;
+        char *buf;
 
         cFYI(1, "Closedir inode = 0x%p", inode);
 
+        if (cfile == NULL)
+                return rc;
+
         xid = get_xid();
+        tcon = tlink_tcon(cfile->tlink);
+        server = tcon->ses->server;
 
-        if (cfile) {
-                struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
+        cFYI(1, "Freeing private data in close dir");
+        spin_lock(&cifs_file_list_lock);
+        if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) {
+                cfile->invalidHandle = true;
+                spin_unlock(&cifs_file_list_lock);
+                if (server->ops->close_dir)
+                        rc = server->ops->close_dir(xid, tcon, &cfile->fid);
+                else
+                        rc = -ENOSYS;
+                cFYI(1, "Closing uncompleted readdir with rc %d", rc);
+                /* not much we can do if it fails anyway, ignore rc */
+                rc = 0;
+        } else
+                spin_unlock(&cifs_file_list_lock);
 
-                cFYI(1, "Freeing private data in close dir");
-                spin_lock(&cifs_file_list_lock);
-                if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) {
-                        cfile->invalidHandle = true;
-                        spin_unlock(&cifs_file_list_lock);
-                        rc = CIFSFindClose(xid, tcon, cfile->fid.netfid);
-                        cFYI(1, "Closing uncompleted readdir with rc %d", rc);
-                        /* not much we can do if it fails anyway, ignore rc */
-                        rc = 0;
-                } else
-                        spin_unlock(&cifs_file_list_lock);
-                tmp = cfile->srch_inf.ntwrk_buf_start;
-                if (tmp) {
-                        cFYI(1, "closedir free smb buf in srch struct");
-                        cfile->srch_inf.ntwrk_buf_start = NULL;
-                        if (cfile->srch_inf.smallBuf)
-                                cifs_small_buf_release(tmp);
-                        else
-                                cifs_buf_release(tmp);
-                }
-                cifs_put_tlink(cfile->tlink);
-                kfree(file->private_data);
-                file->private_data = NULL;
+        buf = cfile->srch_inf.ntwrk_buf_start;
+        if (buf) {
+                cFYI(1, "closedir free smb buf in srch struct");
+                cfile->srch_inf.ntwrk_buf_start = NULL;
+                if (cfile->srch_inf.smallBuf)
+                        cifs_small_buf_release(buf);
+                else
+                        cifs_buf_release(buf);
         }
+
+        cifs_put_tlink(cfile->tlink);
+        kfree(file->private_data);
+        file->private_data = NULL;
         /* BB can we lock the filestruct while this is going on? */
         free_xid(xid);
         return rc;