Skip to content

Commit

Permalink
[CIFS] Remove cifs_sb argument from *build_path_from_dentry
Browse files Browse the repository at this point in the history 
This argument was added in a recent patch, but is unnecessary, since
the superblock is easily obtained from the dentry.

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
  • Loading branch information
Steve French committed Aug 30, 2005
1 parent a9d02ad commit 7f57356
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion fs/cifs/cifsproto.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ extern unsigned int _GetXid(void);
extern void _FreeXid(unsigned int);
#define GetXid() (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__FUNCTION__, xid,current->fsuid));
#define FreeXid(curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__FUNCTION__,curr_xid,(int)rc));}
extern char *build_path_from_dentry(struct dentry *, const struct cifs_sb_info *cifs_sb);
extern char *build_path_from_dentry(struct dentry *);
extern char *build_wildcard_path_from_dentry(struct dentry *direntry);
extern void renew_parental_timestamps(struct dentry *direntry);
extern int SendReceive(const unsigned int /* xid */ , struct cifsSesInfo *,
Expand Down
11 changes: 6 additions & 5 deletions fs/cifs/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ renew_parental_timestamps(struct dentry *direntry)

/* Note: caller must free return buffer */
char *
build_path_from_dentry(struct dentry *direntry, const struct cifs_sb_info *cifs_sb)
build_path_from_dentry(struct dentry *direntry)
{
struct dentry *temp;
int namelen = 0;
char *full_path;
char dirsep = CIFS_DIR_SEP(CIFS_SB(direntry->d_sb));

if(direntry == NULL)
return NULL; /* not much we can do if dentry is freed and
Expand All @@ -74,7 +75,7 @@ build_path_from_dentry(struct dentry *direntry, const struct cifs_sb_info *cifs_
if (namelen < 0) {
break;
} else {
full_path[namelen] = CIFS_DIR_SEP(cifs_sb);
full_path[namelen] = dirsep;
strncpy(full_path + namelen + 1, temp->d_name.name,
temp->d_name.len);
cFYI(0, (" name: %s ", full_path + namelen));
Expand Down Expand Up @@ -138,7 +139,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
pTcon = cifs_sb->tcon;

down(&direntry->d_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&direntry->d_sb->s_vfs_rename_sem);
if(full_path == NULL) {
FreeXid(xid);
Expand Down Expand Up @@ -310,7 +311,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, dev_t dev
pTcon = cifs_sb->tcon;

down(&direntry->d_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&direntry->d_sb->s_vfs_rename_sem);
if(full_path == NULL)
rc = -ENOMEM;
Expand Down Expand Up @@ -409,7 +410,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, struct name
/* can not grab the rename sem here since it would
deadlock in the cases (beginning of sys_rename itself)
in which we already have the sb rename sem */
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
if(full_path == NULL) {
FreeXid(xid);
return ERR_PTR(-ENOMEM);
Expand Down
2 changes: 1 addition & 1 deletion fs/cifs/fcntl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int cifs_dir_notify(struct file * file, unsigned long arg)
pTcon = cifs_sb->tcon;

down(&file->f_dentry->d_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(file->f_dentry, cifs_sb);
full_path = build_path_from_dentry(file->f_dentry);
up(&file->f_dentry->d_sb->s_vfs_rename_sem);

if(full_path == NULL) {
Expand Down
4 changes: 2 additions & 2 deletions fs/cifs/file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ int cifs_open(struct inode *inode, struct file *file)
}

down(&inode->i_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(file->f_dentry, cifs_sb);
full_path = build_path_from_dentry(file->f_dentry);
up(&inode->i_sb->s_vfs_rename_sem);
if (full_path == NULL) {
FreeXid(xid);
Expand Down Expand Up @@ -366,7 +366,7 @@ static int cifs_reopen_file(struct inode *inode, struct file *file,
those that already have the rename sem can end up causing writepage
to get called and if the server was down that means we end up here,
and we can never tell if the caller already has the rename_sem */
full_path = build_path_from_dentry(file->f_dentry, cifs_sb);
full_path = build_path_from_dentry(file->f_dentry);
if (full_path == NULL) {
up(&pCifsFile->fh_sem);
FreeXid(xid);
Expand Down
14 changes: 7 additions & 7 deletions fs/cifs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
/* Unlink can be called from rename so we can not grab the sem here
since we deadlock otherwise */
/* down(&direntry->d_sb->s_vfs_rename_sem);*/
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
/* up(&direntry->d_sb->s_vfs_rename_sem);*/
if (full_path == NULL) {
FreeXid(xid);
Expand Down Expand Up @@ -580,7 +580,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
pTcon = cifs_sb->tcon;

down(&inode->i_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&inode->i_sb->s_vfs_rename_sem);
if (full_path == NULL) {
FreeXid(xid);
Expand Down Expand Up @@ -654,7 +654,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
pTcon = cifs_sb->tcon;

down(&inode->i_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&inode->i_sb->s_vfs_rename_sem);
if (full_path == NULL) {
FreeXid(xid);
Expand Down Expand Up @@ -707,8 +707,8 @@ int cifs_rename(struct inode *source_inode, struct dentry *source_direntry,

/* we already have the rename sem so we do not need to grab it again
here to protect the path integrity */
fromName = build_path_from_dentry(source_direntry, cifs_sb_source);
toName = build_path_from_dentry(target_direntry, cifs_sb_target);
fromName = build_path_from_dentry(source_direntry);
toName = build_path_from_dentry(target_direntry);
if ((fromName == NULL) || (toName == NULL)) {
rc = -ENOMEM;
goto cifs_rename_exit;
Expand Down Expand Up @@ -824,7 +824,7 @@ int cifs_revalidate(struct dentry *direntry)

/* can not safely grab the rename sem here if rename calls revalidate
since that would deadlock */
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
FreeXid(xid);
return -ENOMEM;
Expand Down Expand Up @@ -973,7 +973,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
pTcon = cifs_sb->tcon;

down(&direntry->d_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&direntry->d_sb->s_vfs_rename_sem);
if (full_path == NULL) {
FreeXid(xid);
Expand Down
15 changes: 7 additions & 8 deletions fs/cifs/link.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ cifs_hardlink(struct dentry *old_file, struct inode *inode,
BB note DFS case in future though (when we may have to check) */

down(&inode->i_sb->s_vfs_rename_sem);
fromName = build_path_from_dentry(old_file, cifs_sb_target);
toName = build_path_from_dentry(direntry, cifs_sb_target);
fromName = build_path_from_dentry(old_file);
toName = build_path_from_dentry(direntry);
up(&inode->i_sb->s_vfs_rename_sem);
if((fromName == NULL) || (toName == NULL)) {
rc = -ENOMEM;
Expand Down Expand Up @@ -105,17 +105,16 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd)

xid = GetXid();

cifs_sb = CIFS_SB(inode->i_sb);
pTcon = cifs_sb->tcon;

down(&direntry->d_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&direntry->d_sb->s_vfs_rename_sem);

if (!full_path)
goto out_no_free;

cFYI(1, ("Full path: %s inode = 0x%p", full_path, inode));
cifs_sb = CIFS_SB(inode->i_sb);
pTcon = cifs_sb->tcon;
target_path = kmalloc(PATH_MAX, GFP_KERNEL);
if (!target_path) {
target_path = ERR_PTR(-ENOMEM);
Expand Down Expand Up @@ -168,7 +167,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname)
pTcon = cifs_sb->tcon;

down(&inode->i_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&inode->i_sb->s_vfs_rename_sem);

if(full_path == NULL) {
Expand Down Expand Up @@ -237,7 +236,7 @@ cifs_readlink(struct dentry *direntry, char __user *pBuffer, int buflen)
/* BB would it be safe against deadlock to grab this sem
even though rename itself grabs the sem and calls lookup? */
/* down(&inode->i_sb->s_vfs_rename_sem);*/
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
/* up(&inode->i_sb->s_vfs_rename_sem);*/

if(full_path == NULL) {
Expand Down
2 changes: 1 addition & 1 deletion fs/cifs/readdir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ static int initiate_cifs_search(const int xid, struct file *file)
return -EINVAL;

down(&file->f_dentry->d_sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(file->f_dentry, cifs_sb);
full_path = build_path_from_dentry(file->f_dentry);
up(&file->f_dentry->d_sb->s_vfs_rename_sem);

if(full_path == NULL) {
Expand Down
8 changes: 4 additions & 4 deletions fs/cifs/xattr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ int cifs_removexattr(struct dentry * direntry, const char * ea_name)
pTcon = cifs_sb->tcon;

down(&sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&sb->s_vfs_rename_sem);
if(full_path == NULL) {
FreeXid(xid);
Expand Down Expand Up @@ -118,7 +118,7 @@ int cifs_setxattr(struct dentry * direntry, const char * ea_name,
pTcon = cifs_sb->tcon;

down(&sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&sb->s_vfs_rename_sem);
if(full_path == NULL) {
FreeXid(xid);
Expand Down Expand Up @@ -227,7 +227,7 @@ ssize_t cifs_getxattr(struct dentry * direntry, const char * ea_name,
pTcon = cifs_sb->tcon;

down(&sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&sb->s_vfs_rename_sem);
if(full_path == NULL) {
FreeXid(xid);
Expand Down Expand Up @@ -328,7 +328,7 @@ ssize_t cifs_listxattr(struct dentry * direntry, char * data, size_t buf_size)
pTcon = cifs_sb->tcon;

down(&sb->s_vfs_rename_sem);
full_path = build_path_from_dentry(direntry, cifs_sb);
full_path = build_path_from_dentry(direntry);
up(&sb->s_vfs_rename_sem);
if(full_path == NULL) {
FreeXid(xid);
Expand Down

0 comments on commit 7f57356

Please sign in to comment.