diff options
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r-- | fs/cifs/inode.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 8d336a900255..95354da606d6 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -412,7 +412,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) | |||
412 | /* Unlink can be called from rename so we can not grab the sem here | 412 | /* Unlink can be called from rename so we can not grab the sem here |
413 | since we deadlock otherwise */ | 413 | since we deadlock otherwise */ |
414 | /* down(&direntry->d_sb->s_vfs_rename_sem);*/ | 414 | /* down(&direntry->d_sb->s_vfs_rename_sem);*/ |
415 | full_path = build_path_from_dentry(direntry); | 415 | full_path = build_path_from_dentry(direntry, cifs_sb); |
416 | /* up(&direntry->d_sb->s_vfs_rename_sem);*/ | 416 | /* up(&direntry->d_sb->s_vfs_rename_sem);*/ |
417 | if (full_path == NULL) { | 417 | if (full_path == NULL) { |
418 | FreeXid(xid); | 418 | FreeXid(xid); |
@@ -556,7 +556,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) | |||
556 | pTcon = cifs_sb->tcon; | 556 | pTcon = cifs_sb->tcon; |
557 | 557 | ||
558 | down(&inode->i_sb->s_vfs_rename_sem); | 558 | down(&inode->i_sb->s_vfs_rename_sem); |
559 | full_path = build_path_from_dentry(direntry); | 559 | full_path = build_path_from_dentry(direntry, cifs_sb); |
560 | up(&inode->i_sb->s_vfs_rename_sem); | 560 | up(&inode->i_sb->s_vfs_rename_sem); |
561 | if (full_path == NULL) { | 561 | if (full_path == NULL) { |
562 | FreeXid(xid); | 562 | FreeXid(xid); |
@@ -627,7 +627,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry) | |||
627 | pTcon = cifs_sb->tcon; | 627 | pTcon = cifs_sb->tcon; |
628 | 628 | ||
629 | down(&inode->i_sb->s_vfs_rename_sem); | 629 | down(&inode->i_sb->s_vfs_rename_sem); |
630 | full_path = build_path_from_dentry(direntry); | 630 | full_path = build_path_from_dentry(direntry, cifs_sb); |
631 | up(&inode->i_sb->s_vfs_rename_sem); | 631 | up(&inode->i_sb->s_vfs_rename_sem); |
632 | if (full_path == NULL) { | 632 | if (full_path == NULL) { |
633 | FreeXid(xid); | 633 | FreeXid(xid); |
@@ -680,8 +680,8 @@ int cifs_rename(struct inode *source_inode, struct dentry *source_direntry, | |||
680 | 680 | ||
681 | /* we already have the rename sem so we do not need to grab it again | 681 | /* we already have the rename sem so we do not need to grab it again |
682 | here to protect the path integrity */ | 682 | here to protect the path integrity */ |
683 | fromName = build_path_from_dentry(source_direntry); | 683 | fromName = build_path_from_dentry(source_direntry, cifs_sb_source); |
684 | toName = build_path_from_dentry(target_direntry); | 684 | toName = build_path_from_dentry(target_direntry, cifs_sb_target); |
685 | if ((fromName == NULL) || (toName == NULL)) { | 685 | if ((fromName == NULL) || (toName == NULL)) { |
686 | rc = -ENOMEM; | 686 | rc = -ENOMEM; |
687 | goto cifs_rename_exit; | 687 | goto cifs_rename_exit; |
@@ -797,7 +797,7 @@ int cifs_revalidate(struct dentry *direntry) | |||
797 | 797 | ||
798 | /* can not safely grab the rename sem here if rename calls revalidate | 798 | /* can not safely grab the rename sem here if rename calls revalidate |
799 | since that would deadlock */ | 799 | since that would deadlock */ |
800 | full_path = build_path_from_dentry(direntry); | 800 | full_path = build_path_from_dentry(direntry, cifs_sb); |
801 | if (full_path == NULL) { | 801 | if (full_path == NULL) { |
802 | FreeXid(xid); | 802 | FreeXid(xid); |
803 | return -ENOMEM; | 803 | return -ENOMEM; |
@@ -946,7 +946,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) | |||
946 | pTcon = cifs_sb->tcon; | 946 | pTcon = cifs_sb->tcon; |
947 | 947 | ||
948 | down(&direntry->d_sb->s_vfs_rename_sem); | 948 | down(&direntry->d_sb->s_vfs_rename_sem); |
949 | full_path = build_path_from_dentry(direntry); | 949 | full_path = build_path_from_dentry(direntry, cifs_sb); |
950 | up(&direntry->d_sb->s_vfs_rename_sem); | 950 | up(&direntry->d_sb->s_vfs_rename_sem); |
951 | if (full_path == NULL) { | 951 | if (full_path == NULL) { |
952 | FreeXid(xid); | 952 | FreeXid(xid); |