CIFS: Move close code to ops struct

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

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index e649fac7d6fe085d2aa8d25e9a19868ac5bb1492..39bf2f3e866ae6bae9af627654d6a38c2a819753 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -269,6 +269,8 @@ struct smb_version_operations {
                    struct cifs_sb_info *);
        /* set fid protocol-specific info */
        void (*set_fid)(struct cifsFileInfo *, struct cifs_fid *, __u32);
+       /* close a file */
+       int (*close)(const unsigned int, struct cifs_tcon *, struct cifs_fid *);
 };
 
 struct smb_version_values {

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 1246cf74e1fb4220502127d448f612a910110d89..14938ee4f6e47425a5e08003657fdc04c3f40ad4 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -326,10 +326,13 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
        cancel_work_sync(&cifs_file->oplock_break);
 
        if (!tcon->need_reconnect && !cifs_file->invalidHandle) {
+               struct TCP_Server_Info *server = tcon->ses->server;
                unsigned int xid;
-               int rc;
+               int rc = -ENOSYS;
+
                xid = get_xid();
-               rc = CIFSSMBClose(xid, tcon, cifs_file->fid.netfid);
+               if (server->ops->close)
+                       rc = server->ops->close(xid, tcon, &cifs_file->fid);
                free_xid(xid);
        }
 
@@ -423,7 +426,8 @@ int cifs_open(struct inode *inode, struct file *file)
 
        cfile = cifs_new_fileinfo(&fid, file, tlink, oplock);
        if (cfile == NULL) {
-               CIFSSMBClose(xid, tcon, fid.netfid);
+               if (tcon->ses->server->ops->close)
+                       tcon->ses->server->ops->close(xid, tcon, &fid);
                rc = -ENOMEM;
                goto out;
        }

diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index 907b3086500044c252abc0806c0a8357d0af3264..bb758476e1399ff03742d095c103251833abf2c9 100644 (file)
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -634,6 +634,13 @@ cifs_set_fid(struct cifsFileInfo *cfile, struct cifs_fid *fid, __u32 oplock)
        cinode->can_cache_brlcks = cinode->clientCanCacheAll;
 }
 
+static int
+cifs_close_file(const unsigned int xid, struct cifs_tcon *tcon,
+               struct cifs_fid *fid)
+{
+       return CIFSSMBClose(xid, tcon, fid->netfid);
+}
+
 struct smb_version_operations smb1_operations = {
        .send_cancel = send_nt_cancel,
        .compare_fids = cifs_compare_fids,
@@ -675,6 +682,7 @@ struct smb_version_operations smb1_operations = {
        .rename_pending_delete = cifs_rename_pending_delete,
        .open = cifs_open_file,
        .set_fid = cifs_set_fid,
+       .close = cifs_close_file,
 };
 
 struct smb_version_values smb1_values = {