Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2...

[karo-tx-linux.git] / fs / cifs / smb2inode.c

diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 2aa5cb08c526a3461ea759ea6f09b8abb65686b9..706482452df4f8ce196520fc2d34043dd1d42e6a 100644 (file)
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -47,6 +47,7 @@ smb2_open_op_close(const unsigned int xid, struct cifs_tcon *tcon,
        int rc, tmprc = 0;
        u64 persistent_fid, volatile_fid;
        __le16 *utf16_path;
+       __u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
 
        utf16_path = cifs_convert_path_to_utf16(full_path, cifs_sb);
        if (!utf16_path)
@@ -54,7 +55,7 @@ smb2_open_op_close(const unsigned int xid, struct cifs_tcon *tcon,
 
        rc = SMB2_open(xid, tcon, utf16_path, &persistent_fid, &volatile_fid,
                       desired_access, create_disposition, file_attributes,
-                      create_options);
+                      create_options, &oplock, NULL);
        if (rc) {
                kfree(utf16_path);
                return rc;
@@ -74,6 +75,22 @@ smb2_open_op_close(const unsigned int xid, struct cifs_tcon *tcon,
                 * SMB2_open() call.
                 */
                break;
+       case SMB2_OP_RENAME:
+               tmprc = SMB2_rename(xid, tcon, persistent_fid, volatile_fid,
+                                   (__le16 *)data);
+               break;
+       case SMB2_OP_HARDLINK:
+               tmprc = SMB2_set_hardlink(xid, tcon, persistent_fid,
+                                         volatile_fid, (__le16 *)data);
+               break;
+       case SMB2_OP_SET_EOF:
+               tmprc = SMB2_set_eof(xid, tcon, persistent_fid, volatile_fid,
+                                    current->tgid, (__le64 *)data);
+               break;
+       case SMB2_OP_SET_INFO:
+               tmprc = SMB2_set_info(xid, tcon, persistent_fid, volatile_fid,
+                                     (FILE_BASIC_INFO *)data);
+               break;
        default:
                cERROR(1, "Invalid command");
                break;
@@ -86,7 +103,7 @@ smb2_open_op_close(const unsigned int xid, struct cifs_tcon *tcon,
        return rc;
 }
 
-static void
+void
 move_smb2_info_to_cifs(FILE_ALL_INFO *dst, struct smb2_file_all_info *src)
 {
        memcpy(dst, src, (size_t)(&src->CurrentByteOffset) - (size_t)src);
@@ -161,3 +178,80 @@ smb2_rmdir(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
                                  0, CREATE_NOT_FILE | CREATE_DELETE_ON_CLOSE,
                                  NULL, SMB2_OP_DELETE);
 }
+
+int
+smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
+           struct cifs_sb_info *cifs_sb)
+{
+       return smb2_open_op_close(xid, tcon, cifs_sb, name, DELETE, FILE_OPEN,
+                                 0, CREATE_DELETE_ON_CLOSE, NULL,
+                                 SMB2_OP_DELETE);
+}
+
+static int
+smb2_set_path_attr(const unsigned int xid, struct cifs_tcon *tcon,
+                  const char *from_name, const char *to_name,
+                  struct cifs_sb_info *cifs_sb, __u32 access, int command)
+{
+       __le16 *smb2_to_name = NULL;
+       int rc;
+
+       smb2_to_name = cifs_convert_path_to_utf16(to_name, cifs_sb);
+       if (smb2_to_name == NULL) {
+               rc = -ENOMEM;
+               goto smb2_rename_path;
+       }
+
+       rc = smb2_open_op_close(xid, tcon, cifs_sb, from_name, access,
+                               FILE_OPEN, 0, 0, smb2_to_name, command);
+smb2_rename_path:
+       kfree(smb2_to_name);
+       return rc;
+}
+
+int
+smb2_rename_path(const unsigned int xid, struct cifs_tcon *tcon,
+                const char *from_name, const char *to_name,
+                struct cifs_sb_info *cifs_sb)
+{
+       return smb2_set_path_attr(xid, tcon, from_name, to_name, cifs_sb,
+                                 DELETE, SMB2_OP_RENAME);
+}
+
+int
+smb2_create_hardlink(const unsigned int xid, struct cifs_tcon *tcon,
+                    const char *from_name, const char *to_name,
+                    struct cifs_sb_info *cifs_sb)
+{
+       return smb2_set_path_attr(xid, tcon, from_name, to_name, cifs_sb,
+                                 FILE_READ_ATTRIBUTES, SMB2_OP_HARDLINK);
+}
+
+int
+smb2_set_path_size(const unsigned int xid, struct cifs_tcon *tcon,
+                  const char *full_path, __u64 size,
+                  struct cifs_sb_info *cifs_sb, bool set_alloc)
+{
+       __le64 eof = cpu_to_le64(size);
+       return smb2_open_op_close(xid, tcon, cifs_sb, full_path,
+                                 FILE_WRITE_DATA, FILE_OPEN, 0, 0, &eof,
+                                 SMB2_OP_SET_EOF);
+}
+
+int
+smb2_set_file_info(struct inode *inode, const char *full_path,
+                  FILE_BASIC_INFO *buf, const unsigned int xid)
+{
+       struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
+       struct tcon_link *tlink;
+       int rc;
+
+       tlink = cifs_sb_tlink(cifs_sb);
+       if (IS_ERR(tlink))
+               return PTR_ERR(tlink);
+       rc = smb2_open_op_close(xid, tlink_tcon(tlink), cifs_sb, full_path,
+                               FILE_WRITE_ATTRIBUTES, FILE_OPEN, 0, 0, buf,
+                               SMB2_OP_SET_INFO);
+       cifs_put_tlink(tlink);
+       return rc;
+}