Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

CIFS: Move rmdir code to ops struct

Browse source 
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Pavel Shilovsky 2012-07-10 16:14:18 +04:00 committed by Steve French
parent a0e731839d
commit f958ca5d88
5 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/cifs/cifsglob.h
View file

@ -253,6 +253,9 @@ struct smb_version_operations {
void (*mkdir_setinfo)(struct inode *, const char *, void (*mkdir_setinfo)(struct inode *, const char *,
struct cifs_sb_info *, struct cifs_tcon *, struct cifs_sb_info *, struct cifs_tcon *,
const unsigned int); const unsigned int);
/* remove directory */
int (*rmdir)(const unsigned int, struct cifs_tcon *, const char *,
struct cifs_sb_info *);
}; };
struct smb_version_values { struct smb_version_values {

3
fs/cifs/cifsproto.h
View file

@ -297,8 +297,7 @@ extern int CIFSSMBUnixSetPathInfo(const unsigned int xid,
extern int CIFSSMBMkDir(const unsigned int xid, struct cifs_tcon *tcon, extern int CIFSSMBMkDir(const unsigned int xid, struct cifs_tcon *tcon,
const char *name, struct cifs_sb_info *cifs_sb); const char *name, struct cifs_sb_info *cifs_sb);
extern int CIFSSMBRmDir(const unsigned int xid, struct cifs_tcon *tcon, extern int CIFSSMBRmDir(const unsigned int xid, struct cifs_tcon *tcon,
const char *name, const struct nls_table *nls_codepage, const char *name, struct cifs_sb_info *cifs_sb);
int remap_special_chars);
extern int CIFSPOSIXDelFile(const unsigned int xid, struct cifs_tcon *tcon, extern int CIFSPOSIXDelFile(const unsigned int xid, struct cifs_tcon *tcon,
const char *name, __u16 type, const char *name, __u16 type,
const struct nls_table *nls_codepage, const struct nls_table *nls_codepage,

15
fs/cifs/cifssmb.c
View file

@ -948,15 +948,15 @@ DelFileRetry:
} }
int int
CIFSSMBRmDir(const unsigned int xid, struct cifs_tcon *tcon, CIFSSMBRmDir(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
const char *dirName, const struct nls_table *nls_codepage, struct cifs_sb_info *cifs_sb)
int remap)
{ {
DELETE_DIRECTORY_REQ *pSMB = NULL; DELETE_DIRECTORY_REQ *pSMB = NULL;
DELETE_DIRECTORY_RSP *pSMBr = NULL; DELETE_DIRECTORY_RSP *pSMBr = NULL;
int rc = 0; int rc = 0;
int bytes_returned; int bytes_returned;
int name_len; int name_len;
int remap = cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR;
cFYI(1, "In CIFSSMBRmDir"); cFYI(1, "In CIFSSMBRmDir");
RmDirRetry: RmDirRetry:
@ -966,14 +966,15 @@ RmDirRetry:
return rc; return rc;
if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
name_len = cifsConvertToUTF16((__le16 *) pSMB->DirName, dirName, name_len = cifsConvertToUTF16((__le16 *) pSMB->DirName, name,
PATH_MAX, nls_codepage, remap); PATH_MAX, cifs_sb->local_nls,
remap);
name_len++; /* trailing null */ name_len++; /* trailing null */
name_len *= 2; name_len *= 2;
} else { /* BB improve check for buffer overruns BB */ } else { /* BB improve check for buffer overruns BB */
name_len = strnlen(dirName, PATH_MAX); name_len = strnlen(name, PATH_MAX);
name_len++; /* trailing null */ name_len++; /* trailing null */
strncpy(pSMB->DirName, dirName, name_len); strncpy(pSMB->DirName, name, name_len);
} }
pSMB->BufferFormat = 0x04; pSMB->BufferFormat = 0x04;

15
fs/cifs/inode.c
View file

@ -1426,7 +1426,8 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
unsigned int xid; unsigned int xid;
struct cifs_sb_info *cifs_sb; struct cifs_sb_info *cifs_sb;
struct tcon_link *tlink; struct tcon_link *tlink;
struct cifs_tcon *pTcon; struct cifs_tcon *tcon;
struct TCP_Server_Info *server;
char *full_path = NULL; char *full_path = NULL;
struct cifsInodeInfo *cifsInode; struct cifsInodeInfo *cifsInode;
@ -1446,10 +1447,16 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
rc = PTR_ERR(tlink); rc = PTR_ERR(tlink);
goto rmdir_exit; goto rmdir_exit;
} }
pTcon = tlink_tcon(tlink); tcon = tlink_tcon(tlink);
server = tcon->ses->server;
rc = CIFSSMBRmDir(xid, pTcon, full_path, cifs_sb->local_nls, if (!server->ops->rmdir) {
cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); rc = -ENOSYS;
cifs_put_tlink(tlink);
goto rmdir_exit;
}
rc = server->ops->rmdir(xid, tcon, full_path, cifs_sb);
cifs_put_tlink(tlink); cifs_put_tlink(tlink);
if (!rc) { if (!rc) {

1
fs/cifs/smb1ops.c
View file

@ -643,6 +643,7 @@ struct smb_version_operations smb1_operations = {
.echo = CIFSSMBEcho, .echo = CIFSSMBEcho,
.mkdir = CIFSSMBMkDir, .mkdir = CIFSSMBMkDir,
.mkdir_setinfo = cifs_mkdir_setinfo, .mkdir_setinfo = cifs_mkdir_setinfo,
.rmdir = CIFSSMBRmDir,
}; };
struct smb_version_values smb1_values = { struct smb_version_values smb1_values = {