提交 5f0319a7 编写于 作者: J Jeff Layton 提交者: Steve French

cifs: clean up variables in cifs_unlink

Change parameters to cifs_unlink to match the ones used in the generic
VFS. Add some local variables to cut down on the amount of struct
dereferencing that needs to be done, and eliminate some unneeded NULL
pointer checks on the parent directory inode. Finally, rename pTcon
to "tcon" to more closely match standard kernel coding style.
Signed-off-by: NJeff Layton <jlayton@redhat.com>
Signed-off-by: NSteve French <sfrench@us.ibm.com>
上级 6bfb09a1
...@@ -41,7 +41,7 @@ extern int cifs_create(struct inode *, struct dentry *, int, ...@@ -41,7 +41,7 @@ extern int cifs_create(struct inode *, struct dentry *, int,
struct nameidata *); struct nameidata *);
extern struct dentry *cifs_lookup(struct inode *, struct dentry *, extern struct dentry *cifs_lookup(struct inode *, struct dentry *,
struct nameidata *); struct nameidata *);
extern int cifs_unlink(struct inode *, struct dentry *); extern int cifs_unlink(struct inode *dir, struct dentry *dentry);
extern int cifs_hardlink(struct dentry *, struct inode *, struct dentry *); extern int cifs_hardlink(struct dentry *, struct inode *, struct dentry *);
extern int cifs_mknod(struct inode *, struct dentry *, int, dev_t); extern int cifs_mknod(struct inode *, struct dentry *, int, dev_t);
extern int cifs_mkdir(struct inode *, struct dentry *, int); extern int cifs_mkdir(struct inode *, struct dentry *, int);
......
...@@ -665,40 +665,34 @@ struct inode *cifs_iget(struct super_block *sb, unsigned long ino) ...@@ -665,40 +665,34 @@ struct inode *cifs_iget(struct super_block *sb, unsigned long ino)
return inode; return inode;
} }
int cifs_unlink(struct inode *inode, struct dentry *direntry) int cifs_unlink(struct inode *dir, struct dentry *dentry)
{ {
int rc = 0; int rc = 0;
int xid; int xid;
struct cifs_sb_info *cifs_sb;
struct cifsTconInfo *pTcon;
char *full_path = NULL; char *full_path = NULL;
struct inode *inode = dentry->d_inode;
struct cifsInodeInfo *cifsInode; struct cifsInodeInfo *cifsInode;
struct super_block *sb = dir->i_sb;
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
struct cifsTconInfo *tcon = cifs_sb->tcon;
FILE_BASIC_INFO *pinfo_buf; FILE_BASIC_INFO *pinfo_buf;
cFYI(1, ("cifs_unlink, inode = 0x%p", inode)); cFYI(1, ("cifs_unlink, dir=0x%p, dentry=0x%p", dir, dentry));
xid = GetXid(); xid = GetXid();
if (inode) /* Unlink can be called from rename so we can not take the
cifs_sb = CIFS_SB(inode->i_sb); * sb->s_vfs_rename_mutex here */
else full_path = build_path_from_dentry(dentry);
cifs_sb = CIFS_SB(direntry->d_sb);
pTcon = cifs_sb->tcon;
/* Unlink can be called from rename so we can not grab the sem here
since we deadlock otherwise */
/* mutex_lock(&direntry->d_sb->s_vfs_rename_mutex);*/
full_path = build_path_from_dentry(direntry);
/* mutex_unlock(&direntry->d_sb->s_vfs_rename_mutex);*/
if (full_path == NULL) { if (full_path == NULL) {
FreeXid(xid); FreeXid(xid);
return -ENOMEM; return -ENOMEM;
} }
if ((pTcon->ses->capabilities & CAP_UNIX) && if ((tcon->ses->capabilities & CAP_UNIX) &&
(CIFS_UNIX_POSIX_PATH_OPS_CAP & (CIFS_UNIX_POSIX_PATH_OPS_CAP &
le64_to_cpu(pTcon->fsUnixInfo.Capability))) { le64_to_cpu(tcon->fsUnixInfo.Capability))) {
rc = CIFSPOSIXDelFile(xid, pTcon, full_path, rc = CIFSPOSIXDelFile(xid, tcon, full_path,
SMB_POSIX_UNLINK_FILE_TARGET, cifs_sb->local_nls, SMB_POSIX_UNLINK_FILE_TARGET, cifs_sb->local_nls,
cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
cFYI(1, ("posix del rc %d", rc)); cFYI(1, ("posix del rc %d", rc));
...@@ -706,31 +700,31 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) ...@@ -706,31 +700,31 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
goto psx_del_no_retry; goto psx_del_no_retry;
} }
rc = CIFSSMBDelFile(xid, pTcon, full_path, cifs_sb->local_nls, rc = CIFSSMBDelFile(xid, tcon, full_path, cifs_sb->local_nls,
cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
psx_del_no_retry: psx_del_no_retry:
if (!rc) { if (!rc) {
if (direntry->d_inode) if (inode)
drop_nlink(direntry->d_inode); drop_nlink(inode);
} else if (rc == -ENOENT) { } else if (rc == -ENOENT) {
d_drop(direntry); d_drop(dentry);
} else if (rc == -ETXTBSY) { } else if (rc == -ETXTBSY) {
int oplock = 0; int oplock = 0;
__u16 netfid; __u16 netfid;
rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN, DELETE, rc = CIFSSMBOpen(xid, tcon, full_path, FILE_OPEN, DELETE,
CREATE_NOT_DIR | CREATE_DELETE_ON_CLOSE, CREATE_NOT_DIR | CREATE_DELETE_ON_CLOSE,
&netfid, &oplock, NULL, cifs_sb->local_nls, &netfid, &oplock, NULL, cifs_sb->local_nls,
cifs_sb->mnt_cifs_flags & cifs_sb->mnt_cifs_flags &
CIFS_MOUNT_MAP_SPECIAL_CHR); CIFS_MOUNT_MAP_SPECIAL_CHR);
if (rc == 0) { if (rc == 0) {
CIFSSMBRenameOpenFile(xid, pTcon, netfid, NULL, CIFSSMBRenameOpenFile(xid, tcon, netfid, NULL,
cifs_sb->local_nls, cifs_sb->local_nls,
cifs_sb->mnt_cifs_flags & cifs_sb->mnt_cifs_flags &
CIFS_MOUNT_MAP_SPECIAL_CHR); CIFS_MOUNT_MAP_SPECIAL_CHR);
CIFSSMBClose(xid, pTcon, netfid); CIFSSMBClose(xid, tcon, netfid);
if (direntry->d_inode) if (inode)
drop_nlink(direntry->d_inode); drop_nlink(inode);
} }
} else if (rc == -EACCES) { } else if (rc == -EACCES) {
/* try only if r/o attribute set in local lookup data? */ /* try only if r/o attribute set in local lookup data? */
...@@ -738,8 +732,8 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) ...@@ -738,8 +732,8 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
if (pinfo_buf) { if (pinfo_buf) {
/* ATTRS set to normal clears r/o bit */ /* ATTRS set to normal clears r/o bit */
pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL); pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL);
if (!(pTcon->ses->flags & CIFS_SES_NT4)) if (!(tcon->ses->flags & CIFS_SES_NT4))
rc = CIFSSMBSetPathInfo(xid, pTcon, full_path, rc = CIFSSMBSetPathInfo(xid, tcon, full_path,
pinfo_buf, pinfo_buf,
cifs_sb->local_nls, cifs_sb->local_nls,
cifs_sb->mnt_cifs_flags & cifs_sb->mnt_cifs_flags &
...@@ -750,7 +744,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) ...@@ -750,7 +744,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
if (rc == -EOPNOTSUPP) { if (rc == -EOPNOTSUPP) {
int oplock = 0; int oplock = 0;
__u16 netfid; __u16 netfid;
/* rc = CIFSSMBSetAttrLegacy(xid, pTcon, /* rc = CIFSSMBSetAttrLegacy(xid, tcon,
full_path, full_path,
(__u16)ATTR_NORMAL, (__u16)ATTR_NORMAL,
cifs_sb->local_nls); cifs_sb->local_nls);
...@@ -761,7 +755,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) ...@@ -761,7 +755,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
/* BB could scan to see if we already have it open /* BB could scan to see if we already have it open
and pass in pid of opener to function */ and pass in pid of opener to function */
rc = CIFSSMBOpen(xid, pTcon, full_path, rc = CIFSSMBOpen(xid, tcon, full_path,
FILE_OPEN, SYNCHRONIZE | FILE_OPEN, SYNCHRONIZE |
FILE_WRITE_ATTRIBUTES, 0, FILE_WRITE_ATTRIBUTES, 0,
&netfid, &oplock, NULL, &netfid, &oplock, NULL,
...@@ -769,28 +763,28 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) ...@@ -769,28 +763,28 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
cifs_sb->mnt_cifs_flags & cifs_sb->mnt_cifs_flags &
CIFS_MOUNT_MAP_SPECIAL_CHR); CIFS_MOUNT_MAP_SPECIAL_CHR);
if (rc == 0) { if (rc == 0) {
rc = CIFSSMBSetFileInfo(xid, pTcon, rc = CIFSSMBSetFileInfo(xid, tcon,
pinfo_buf, pinfo_buf,
netfid, netfid,
current->tgid); current->tgid);
CIFSSMBClose(xid, pTcon, netfid); CIFSSMBClose(xid, tcon, netfid);
} }
} }
kfree(pinfo_buf); kfree(pinfo_buf);
} }
if (rc == 0) { if (rc == 0) {
rc = CIFSSMBDelFile(xid, pTcon, full_path, rc = CIFSSMBDelFile(xid, tcon, full_path,
cifs_sb->local_nls, cifs_sb->local_nls,
cifs_sb->mnt_cifs_flags & cifs_sb->mnt_cifs_flags &
CIFS_MOUNT_MAP_SPECIAL_CHR); CIFS_MOUNT_MAP_SPECIAL_CHR);
if (!rc) { if (!rc) {
if (direntry->d_inode) if (inode)
drop_nlink(direntry->d_inode); drop_nlink(inode);
} else if (rc == -ETXTBSY) { } else if (rc == -ETXTBSY) {
int oplock = 0; int oplock = 0;
__u16 netfid; __u16 netfid;
rc = CIFSSMBOpen(xid, pTcon, full_path, rc = CIFSSMBOpen(xid, tcon, full_path,
FILE_OPEN, DELETE, FILE_OPEN, DELETE,
CREATE_NOT_DIR | CREATE_NOT_DIR |
CREATE_DELETE_ON_CLOSE, CREATE_DELETE_ON_CLOSE,
...@@ -799,30 +793,28 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) ...@@ -799,30 +793,28 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
cifs_sb->mnt_cifs_flags & cifs_sb->mnt_cifs_flags &
CIFS_MOUNT_MAP_SPECIAL_CHR); CIFS_MOUNT_MAP_SPECIAL_CHR);
if (rc == 0) { if (rc == 0) {
CIFSSMBRenameOpenFile(xid, pTcon, CIFSSMBRenameOpenFile(xid, tcon,
netfid, NULL, netfid, NULL,
cifs_sb->local_nls, cifs_sb->local_nls,
cifs_sb->mnt_cifs_flags & cifs_sb->mnt_cifs_flags &
CIFS_MOUNT_MAP_SPECIAL_CHR); CIFS_MOUNT_MAP_SPECIAL_CHR);
CIFSSMBClose(xid, pTcon, netfid); CIFSSMBClose(xid, tcon, netfid);
if (direntry->d_inode) if (inode)
drop_nlink(direntry->d_inode); drop_nlink(inode);
} }
/* BB if rc = -ETXTBUSY goto the rename logic BB */ /* BB if rc = -ETXTBUSY goto the rename logic BB */
} }
} }
} }
if (direntry->d_inode) {
cifsInode = CIFS_I(direntry->d_inode);
cifsInode->time = 0; /* will force revalidate to get info
when needed */
direntry->d_inode->i_ctime = current_fs_time(inode->i_sb);
}
if (inode) { if (inode) {
inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb);
cifsInode = CIFS_I(inode); cifsInode = CIFS_I(inode);
cifsInode->time = 0; /* force revalidate of dir as well */ cifsInode->time = 0; /* will force revalidate to get info
when needed */
inode->i_ctime = current_fs_time(sb);
} }
dir->i_ctime = dir->i_mtime = current_fs_time(sb);
cifsInode = CIFS_I(dir);
cifsInode->time = 0; /* force revalidate of dir as well */
kfree(full_path); kfree(full_path);
FreeXid(xid); FreeXid(xid);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册