aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/inode.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-08-30 14:32:14 -0400
committerSteve French <sfrench@us.ibm.com>2005-08-30 14:32:14 -0400
commit7f57356b70dda014ef269135942426e4a852023e (patch)
treefe17d0aa1882984eb9120389fde048616161f2aa /fs/cifs/inode.c
parenta9d02ad49013c8fc527f06ca66417103cdbb08b6 (diff)
[CIFS] Remove cifs_sb argument from *build_path_from_dentry
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>
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r--fs/cifs/inode.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 34f0168c4041..0485c6d6ecd5 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -436,7 +436,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
436 /* Unlink can be called from rename so we can not grab the sem here 436 /* Unlink can be called from rename so we can not grab the sem here
437 since we deadlock otherwise */ 437 since we deadlock otherwise */
438/* down(&direntry->d_sb->s_vfs_rename_sem);*/ 438/* down(&direntry->d_sb->s_vfs_rename_sem);*/
439 full_path = build_path_from_dentry(direntry, cifs_sb); 439 full_path = build_path_from_dentry(direntry);
440/* up(&direntry->d_sb->s_vfs_rename_sem);*/ 440/* up(&direntry->d_sb->s_vfs_rename_sem);*/
441 if (full_path == NULL) { 441 if (full_path == NULL) {
442 FreeXid(xid); 442 FreeXid(xid);
@@ -580,7 +580,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
580 pTcon = cifs_sb->tcon; 580 pTcon = cifs_sb->tcon;
581 581
582 down(&inode->i_sb->s_vfs_rename_sem); 582 down(&inode->i_sb->s_vfs_rename_sem);
583 full_path = build_path_from_dentry(direntry, cifs_sb); 583 full_path = build_path_from_dentry(direntry);
584 up(&inode->i_sb->s_vfs_rename_sem); 584 up(&inode->i_sb->s_vfs_rename_sem);
585 if (full_path == NULL) { 585 if (full_path == NULL) {
586 FreeXid(xid); 586 FreeXid(xid);
@@ -654,7 +654,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
654 pTcon = cifs_sb->tcon; 654 pTcon = cifs_sb->tcon;
655 655
656 down(&inode->i_sb->s_vfs_rename_sem); 656 down(&inode->i_sb->s_vfs_rename_sem);
657 full_path = build_path_from_dentry(direntry, cifs_sb); 657 full_path = build_path_from_dentry(direntry);
658 up(&inode->i_sb->s_vfs_rename_sem); 658 up(&inode->i_sb->s_vfs_rename_sem);
659 if (full_path == NULL) { 659 if (full_path == NULL) {
660 FreeXid(xid); 660 FreeXid(xid);
@@ -707,8 +707,8 @@ int cifs_rename(struct inode *source_inode, struct dentry *source_direntry,
707 707
708 /* we already have the rename sem so we do not need to grab it again 708 /* we already have the rename sem so we do not need to grab it again
709 here to protect the path integrity */ 709 here to protect the path integrity */
710 fromName = build_path_from_dentry(source_direntry, cifs_sb_source); 710 fromName = build_path_from_dentry(source_direntry);
711 toName = build_path_from_dentry(target_direntry, cifs_sb_target); 711 toName = build_path_from_dentry(target_direntry);
712 if ((fromName == NULL) || (toName == NULL)) { 712 if ((fromName == NULL) || (toName == NULL)) {
713 rc = -ENOMEM; 713 rc = -ENOMEM;
714 goto cifs_rename_exit; 714 goto cifs_rename_exit;
@@ -824,7 +824,7 @@ int cifs_revalidate(struct dentry *direntry)
824 824
825 /* can not safely grab the rename sem here if rename calls revalidate 825 /* can not safely grab the rename sem here if rename calls revalidate
826 since that would deadlock */ 826 since that would deadlock */
827 full_path = build_path_from_dentry(direntry, cifs_sb); 827 full_path = build_path_from_dentry(direntry);
828 if (full_path == NULL) { 828 if (full_path == NULL) {
829 FreeXid(xid); 829 FreeXid(xid);
830 return -ENOMEM; 830 return -ENOMEM;
@@ -973,7 +973,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
973 pTcon = cifs_sb->tcon; 973 pTcon = cifs_sb->tcon;
974 974
975 down(&direntry->d_sb->s_vfs_rename_sem); 975 down(&direntry->d_sb->s_vfs_rename_sem);
976 full_path = build_path_from_dentry(direntry, cifs_sb); 976 full_path = build_path_from_dentry(direntry);
977 up(&direntry->d_sb->s_vfs_rename_sem); 977 up(&direntry->d_sb->s_vfs_rename_sem);
978 if (full_path == NULL) { 978 if (full_path == NULL) {
979 FreeXid(xid); 979 FreeXid(xid);