CIFS: Add SMB2 support for rmdir

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

diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index e129527a707adbf003d3bd29b026e098daf7a411..2aa5cb08c526a3461ea759ea6f09b8abb65686b9 100644 (file)
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -152,3 +152,12 @@ smb2_mkdir_setinfo(struct inode *inode, const char *name,
        if (tmprc == 0)
                cifs_i->cifsAttrs = dosattrs;
 }
+
+int
+smb2_rmdir(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_NOT_FILE | CREATE_DELETE_ON_CLOSE,
+                                 NULL, SMB2_OP_DELETE);
+}

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index cc74871d2598e85c6f644b471b9ce2dbc6ffe3bb..826209bf36842c904259533a0199fc6f5138a0b9 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -320,6 +320,7 @@ struct smb_version_operations smb21_operations = {
        .build_path_to_root = smb2_build_path_to_root,
        .mkdir = smb2_mkdir,
        .mkdir_setinfo = smb2_mkdir_setinfo,
+       .rmdir = smb2_rmdir,
 };
 
 struct smb_version_values smb21_values = {

diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index f9925082737c6e78e22eb35a9ec50b3f19d37d53..bfaa7b148afd0e4d3d334a52c699a90dac75aeea 100644 (file)
--- a/fs/cifs/smb2proto.h
+++ b/fs/cifs/smb2proto.h
@@ -57,6 +57,8 @@ extern int smb2_mkdir(const unsigned int xid, struct cifs_tcon *tcon,
 extern void smb2_mkdir_setinfo(struct inode *inode, const char *full_path,
                               struct cifs_sb_info *cifs_sb,
                               struct cifs_tcon *tcon, const unsigned int xid);
+extern int smb2_rmdir(const unsigned int xid, struct cifs_tcon *tcon,
+                     const char *name, struct cifs_sb_info *cifs_sb);
 
 /*
  * SMB2 Worker functions - most of protocol specific implementation details