CIFS: Move set_file_info 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 803c21218633309bdce1433d8b07acb98fe0ea9e..dff35830601f066e28a8ed2e188988cf6fbb8f66 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -258,6 +258,9 @@ struct smb_version_operations {
        /* set size by file handle */
        int (*set_file_size)(const unsigned int, struct cifs_tcon *,
                             struct cifsFileInfo *, __u64, bool);
+       /* set attributes */
+       int (*set_file_info)(struct inode *, const char *, FILE_BASIC_INFO *,
+                            const unsigned int);
        /* build a full path to the root of the mount */
        char * (*build_path_to_root)(struct smb_vol *, struct cifs_sb_info *,
                                     struct cifs_tcon *);

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 85e1b0a405a8d0ef1b6839a4753182838969c829..e74e1bceb416d094c563897928f0c42527e30293 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -886,21 +886,18 @@ int
 cifs_set_file_info(struct inode *inode, struct iattr *attrs, unsigned int xid,
                   char *full_path, __u32 dosattr)
 {
-       int rc;
-       int oplock = 0;
-       __u16 netfid;
-       __u32 netpid;
        bool set_time = false;
-       struct cifsFileInfo *open_file;
-       struct cifsInodeInfo *cifsInode = CIFS_I(inode);
        struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
-       struct tcon_link *tlink = NULL;
-       struct cifs_tcon *pTcon;
+       struct TCP_Server_Info *server;
        FILE_BASIC_INFO info_buf;
 
        if (attrs == NULL)
                return -EINVAL;
 
+       server = cifs_sb_master_tcon(cifs_sb)->ses->server;
+       if (!server->ops->set_file_info)
+               return -ENOSYS;
+
        if (attrs->ia_valid & ATTR_ATIME) {
                set_time = true;
                info_buf.LastAccessTime =
@@ -931,71 +928,7 @@ cifs_set_file_info(struct inode *inode, struct iattr *attrs, unsigned int xid,
        info_buf.CreationTime = 0;      /* don't change */
        info_buf.Attributes = cpu_to_le32(dosattr);
 
-       /*
-        * If the file is already open for write, just use that fileid
-        */
-       open_file = find_writable_file(cifsInode, true);
-       if (open_file) {
-               netfid = open_file->fid.netfid;
-               netpid = open_file->pid;
-               pTcon = tlink_tcon(open_file->tlink);
-               goto set_via_filehandle;
-       }
-
-       tlink = cifs_sb_tlink(cifs_sb);
-       if (IS_ERR(tlink)) {
-               rc = PTR_ERR(tlink);
-               tlink = NULL;
-               goto out;
-       }
-       pTcon = tlink_tcon(tlink);
-
-       /*
-        * NT4 apparently returns success on this call, but it doesn't
-        * really work.
-        */
-       if (!(pTcon->ses->flags & CIFS_SES_NT4)) {
-               rc = CIFSSMBSetPathInfo(xid, pTcon, full_path,
-                                    &info_buf, cifs_sb->local_nls,
-                                    cifs_sb->mnt_cifs_flags &
-                                       CIFS_MOUNT_MAP_SPECIAL_CHR);
-               if (rc == 0) {
-                       cifsInode->cifsAttrs = dosattr;
-                       goto out;
-               } else if (rc != -EOPNOTSUPP && rc != -EINVAL)
-                       goto out;
-       }
-
-       cFYI(1, "calling SetFileInfo since SetPathInfo for "
-                "times not supported by this server");
-       rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN,
-                        SYNCHRONIZE | FILE_WRITE_ATTRIBUTES,
-                        CREATE_NOT_DIR, &netfid, &oplock,
-                        NULL, cifs_sb->local_nls,
-                        cifs_sb->mnt_cifs_flags &
-                               CIFS_MOUNT_MAP_SPECIAL_CHR);
-
-       if (rc != 0) {
-               if (rc == -EIO)
-                       rc = -EINVAL;
-               goto out;
-       }
-
-       netpid = current->tgid;
-
-set_via_filehandle:
-       rc = CIFSSMBSetFileInfo(xid, pTcon, &info_buf, netfid, netpid);
-       if (!rc)
-               cifsInode->cifsAttrs = dosattr;
-
-       if (open_file == NULL)
-               CIFSSMBClose(xid, pTcon, netfid);
-       else
-               cifsFileInfo_put(open_file);
-out:
-       if (tlink != NULL)
-               cifs_put_tlink(tlink);
-       return rc;
+       return server->ops->set_file_info(inode, full_path, &info_buf, xid);
 }
 
 /*

diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index b73d2750296d22754c76bdaef96a1821582f969c..ed311968437af1b14c370cf5633e0af65a3db017 100644 (file)
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -758,6 +758,84 @@ cifs_sync_write(const unsigned int xid, struct cifsFileInfo *cfile,
        return CIFSSMBWrite2(xid, parms, written, iov, nr_segs);
 }
 
+static int
+smb_set_file_info(struct inode *inode, const char *full_path,
+                 FILE_BASIC_INFO *buf, const unsigned int xid)
+{
+       int oplock = 0;
+       int rc;
+       __u16 netfid;
+       __u32 netpid;
+       struct cifsFileInfo *open_file;
+       struct cifsInodeInfo *cinode = CIFS_I(inode);
+       struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
+       struct tcon_link *tlink = NULL;
+       struct cifs_tcon *tcon;
+       FILE_BASIC_INFO info_buf;
+
+       /* if the file is already open for write, just use that fileid */
+       open_file = find_writable_file(cinode, true);
+       if (open_file) {
+               netfid = open_file->fid.netfid;
+               netpid = open_file->pid;
+               tcon = tlink_tcon(open_file->tlink);
+               goto set_via_filehandle;
+       }
+
+       tlink = cifs_sb_tlink(cifs_sb);
+       if (IS_ERR(tlink)) {
+               rc = PTR_ERR(tlink);
+               tlink = NULL;
+               goto out;
+       }
+       tcon = tlink_tcon(tlink);
+
+       /*
+        * NT4 apparently returns success on this call, but it doesn't really
+        * work.
+        */
+       if (!(tcon->ses->flags & CIFS_SES_NT4)) {
+               rc = CIFSSMBSetPathInfo(xid, tcon, full_path, buf,
+                                       cifs_sb->local_nls,
+                                       cifs_sb->mnt_cifs_flags &
+                                               CIFS_MOUNT_MAP_SPECIAL_CHR);
+               if (rc == 0) {
+                       cinode->cifsAttrs = le32_to_cpu(buf->Attributes);
+                       goto out;
+               } else if (rc != -EOPNOTSUPP && rc != -EINVAL)
+                       goto out;
+       }
+
+       cFYI(1, "calling SetFileInfo since SetPathInfo for times not supported "
+               "by this server");
+       rc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN,
+                        SYNCHRONIZE | FILE_WRITE_ATTRIBUTES, CREATE_NOT_DIR,
+                        &netfid, &oplock, NULL, cifs_sb->local_nls,
+                        cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+
+       if (rc != 0) {
+               if (rc == -EIO)
+                       rc = -EINVAL;
+               goto out;
+       }
+
+       netpid = current->tgid;
+
+set_via_filehandle:
+       rc = CIFSSMBSetFileInfo(xid, tcon, &info_buf, netfid, netpid);
+       if (!rc)
+               cinode->cifsAttrs = le32_to_cpu(buf->Attributes);
+
+       if (open_file == NULL)
+               CIFSSMBClose(xid, tcon, netfid);
+       else
+               cifsFileInfo_put(open_file);
+out:
+       if (tlink != NULL)
+               cifs_put_tlink(tlink);
+       return rc;
+}
+
 struct smb_version_operations smb1_operations = {
        .send_cancel = send_nt_cancel,
        .compare_fids = cifs_compare_fids,
@@ -795,6 +873,7 @@ struct smb_version_operations smb1_operations = {
        .get_srv_inum = cifs_get_srv_inum,
        .set_path_size = CIFSSMBSetEOF,
        .set_file_size = CIFSSMBSetFileSize,
+       .set_file_info = smb_set_file_info,
        .build_path_to_root = cifs_build_path_to_root,
        .echo = CIFSSMBEcho,
        .mkdir = CIFSSMBMkDir,