aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPavel Shilovsky <pshilovsky@samba.org>2012-07-10 08:14:38 -0400
committerSteve French <smfrench@gmail.com>2012-07-27 16:17:50 -0400
commit1a500f010fb2d121c58f77ddfde2eca1bde3bfcd (patch)
tree13bca8292a02972e58c6de8a880931a449c2df5c /fs
parentf958ca5d88e6071767b10549d544b3475dfb6996 (diff)
CIFS: Add SMB2 support for rmdir
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/smb2inode.c9
-rw-r--r--fs/cifs/smb2ops.c1
-rw-r--r--fs/cifs/smb2proto.h2
3 files changed, 12 insertions, 0 deletions
diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index e129527a707a..2aa5cb08c526 100644
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -152,3 +152,12 @@ smb2_mkdir_setinfo(struct inode *inode, const char *name,
152 if (tmprc == 0) 152 if (tmprc == 0)
153 cifs_i->cifsAttrs = dosattrs; 153 cifs_i->cifsAttrs = dosattrs;
154} 154}
155
156int
157smb2_rmdir(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
158 struct cifs_sb_info *cifs_sb)
159{
160 return smb2_open_op_close(xid, tcon, cifs_sb, name, DELETE, FILE_OPEN,
161 0, CREATE_NOT_FILE | CREATE_DELETE_ON_CLOSE,
162 NULL, SMB2_OP_DELETE);
163}
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index cc74871d2598..826209bf3684 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -320,6 +320,7 @@ struct smb_version_operations smb21_operations = {
320 .build_path_to_root = smb2_build_path_to_root, 320 .build_path_to_root = smb2_build_path_to_root,
321 .mkdir = smb2_mkdir, 321 .mkdir = smb2_mkdir,
322 .mkdir_setinfo = smb2_mkdir_setinfo, 322 .mkdir_setinfo = smb2_mkdir_setinfo,
323 .rmdir = smb2_rmdir,
323}; 324};
324 325
325struct smb_version_values smb21_values = { 326struct smb_version_values smb21_values = {
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index f9925082737c..bfaa7b148afd 100644
--- 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,
57extern void smb2_mkdir_setinfo(struct inode *inode, const char *full_path, 57extern void smb2_mkdir_setinfo(struct inode *inode, const char *full_path,
58 struct cifs_sb_info *cifs_sb, 58 struct cifs_sb_info *cifs_sb,
59 struct cifs_tcon *tcon, const unsigned int xid); 59 struct cifs_tcon *tcon, const unsigned int xid);
60extern int smb2_rmdir(const unsigned int xid, struct cifs_tcon *tcon,
61 const char *name, struct cifs_sb_info *cifs_sb);
60 62
61/* 63/*
62 * SMB2 Worker functions - most of protocol specific implementation details 64 * SMB2 Worker functions - most of protocol specific implementation details