diff options
| -rw-r--r-- | fs/cifs/dir.c | 4 | ||||
| -rw-r--r-- | fs/cifs/fcntl.c | 2 | ||||
| -rw-r--r-- | fs/cifs/file.c | 2 | ||||
| -rw-r--r-- | fs/cifs/inode.c | 6 | ||||
| -rw-r--r-- | fs/cifs/link.c | 6 | ||||
| -rw-r--r-- | fs/cifs/readdir.c | 2 | ||||
| -rw-r--r-- | fs/cifs/xattr.c | 8 |
7 files changed, 0 insertions, 30 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 1d0ca3eaaca5..3830dfeb31cf 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
| @@ -139,9 +139,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, | |||
| 139 | cifs_sb = CIFS_SB(inode->i_sb); | 139 | cifs_sb = CIFS_SB(inode->i_sb); |
| 140 | pTcon = cifs_sb->tcon; | 140 | pTcon = cifs_sb->tcon; |
| 141 | 141 | ||
| 142 | mutex_lock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 143 | full_path = build_path_from_dentry(direntry); | 142 | full_path = build_path_from_dentry(direntry); |
| 144 | mutex_unlock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 145 | if(full_path == NULL) { | 143 | if(full_path == NULL) { |
| 146 | FreeXid(xid); | 144 | FreeXid(xid); |
| 147 | return -ENOMEM; | 145 | return -ENOMEM; |
| @@ -316,9 +314,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, | |||
| 316 | cifs_sb = CIFS_SB(inode->i_sb); | 314 | cifs_sb = CIFS_SB(inode->i_sb); |
| 317 | pTcon = cifs_sb->tcon; | 315 | pTcon = cifs_sb->tcon; |
| 318 | 316 | ||
| 319 | mutex_lock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 320 | full_path = build_path_from_dentry(direntry); | 317 | full_path = build_path_from_dentry(direntry); |
| 321 | mutex_unlock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 322 | if(full_path == NULL) | 318 | if(full_path == NULL) |
| 323 | rc = -ENOMEM; | 319 | rc = -ENOMEM; |
| 324 | else if (pTcon->ses->capabilities & CAP_UNIX) { | 320 | else if (pTcon->ses->capabilities & CAP_UNIX) { |
diff --git a/fs/cifs/fcntl.c b/fs/cifs/fcntl.c index ec4dfe9bf5ef..633a93811328 100644 --- a/fs/cifs/fcntl.c +++ b/fs/cifs/fcntl.c | |||
| @@ -86,9 +86,7 @@ int cifs_dir_notify(struct file * file, unsigned long arg) | |||
| 86 | cifs_sb = CIFS_SB(file->f_dentry->d_sb); | 86 | cifs_sb = CIFS_SB(file->f_dentry->d_sb); |
| 87 | pTcon = cifs_sb->tcon; | 87 | pTcon = cifs_sb->tcon; |
| 88 | 88 | ||
| 89 | mutex_lock(&file->f_dentry->d_sb->s_vfs_rename_mutex); | ||
| 90 | full_path = build_path_from_dentry(file->f_dentry); | 89 | full_path = build_path_from_dentry(file->f_dentry); |
| 91 | mutex_unlock(&file->f_dentry->d_sb->s_vfs_rename_mutex); | ||
| 92 | 90 | ||
| 93 | if(full_path == NULL) { | 91 | if(full_path == NULL) { |
| 94 | rc = -ENOMEM; | 92 | rc = -ENOMEM; |
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 5c497c529772..1476725e6051 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
| @@ -203,9 +203,7 @@ int cifs_open(struct inode *inode, struct file *file) | |||
| 203 | } | 203 | } |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 207 | full_path = build_path_from_dentry(file->f_dentry); | 206 | full_path = build_path_from_dentry(file->f_dentry); |
| 208 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 209 | if (full_path == NULL) { | 207 | if (full_path == NULL) { |
| 210 | FreeXid(xid); | 208 | FreeXid(xid); |
| 211 | return -ENOMEM; | 209 | return -ENOMEM; |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 957ddd1571c6..4093764ef461 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -722,9 +722,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) | |||
| 722 | cifs_sb = CIFS_SB(inode->i_sb); | 722 | cifs_sb = CIFS_SB(inode->i_sb); |
| 723 | pTcon = cifs_sb->tcon; | 723 | pTcon = cifs_sb->tcon; |
| 724 | 724 | ||
| 725 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 726 | full_path = build_path_from_dentry(direntry); | 725 | full_path = build_path_from_dentry(direntry); |
| 727 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 728 | if (full_path == NULL) { | 726 | if (full_path == NULL) { |
| 729 | FreeXid(xid); | 727 | FreeXid(xid); |
| 730 | return -ENOMEM; | 728 | return -ENOMEM; |
| @@ -807,9 +805,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry) | |||
| 807 | cifs_sb = CIFS_SB(inode->i_sb); | 805 | cifs_sb = CIFS_SB(inode->i_sb); |
| 808 | pTcon = cifs_sb->tcon; | 806 | pTcon = cifs_sb->tcon; |
| 809 | 807 | ||
| 810 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 811 | full_path = build_path_from_dentry(direntry); | 808 | full_path = build_path_from_dentry(direntry); |
| 812 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 813 | if (full_path == NULL) { | 809 | if (full_path == NULL) { |
| 814 | FreeXid(xid); | 810 | FreeXid(xid); |
| 815 | return -ENOMEM; | 811 | return -ENOMEM; |
| @@ -1141,9 +1137,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) | |||
| 1141 | rc = 0; | 1137 | rc = 0; |
| 1142 | } | 1138 | } |
| 1143 | 1139 | ||
| 1144 | mutex_lock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 1145 | full_path = build_path_from_dentry(direntry); | 1140 | full_path = build_path_from_dentry(direntry); |
| 1146 | mutex_unlock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 1147 | if (full_path == NULL) { | 1141 | if (full_path == NULL) { |
| 1148 | FreeXid(xid); | 1142 | FreeXid(xid); |
| 1149 | return -ENOMEM; | 1143 | return -ENOMEM; |
diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 9562f5bba65c..2ec99f833142 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c | |||
| @@ -48,10 +48,8 @@ cifs_hardlink(struct dentry *old_file, struct inode *inode, | |||
| 48 | /* No need to check for cross device links since server will do that | 48 | /* No need to check for cross device links since server will do that |
| 49 | BB note DFS case in future though (when we may have to check) */ | 49 | BB note DFS case in future though (when we may have to check) */ |
| 50 | 50 | ||
| 51 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 52 | fromName = build_path_from_dentry(old_file); | 51 | fromName = build_path_from_dentry(old_file); |
| 53 | toName = build_path_from_dentry(direntry); | 52 | toName = build_path_from_dentry(direntry); |
| 54 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 55 | if((fromName == NULL) || (toName == NULL)) { | 53 | if((fromName == NULL) || (toName == NULL)) { |
| 56 | rc = -ENOMEM; | 54 | rc = -ENOMEM; |
| 57 | goto cifs_hl_exit; | 55 | goto cifs_hl_exit; |
| @@ -103,9 +101,7 @@ cifs_follow_link(struct dentry *direntry, struct nameidata *nd) | |||
| 103 | 101 | ||
| 104 | xid = GetXid(); | 102 | xid = GetXid(); |
| 105 | 103 | ||
| 106 | mutex_lock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 107 | full_path = build_path_from_dentry(direntry); | 104 | full_path = build_path_from_dentry(direntry); |
| 108 | mutex_unlock(&direntry->d_sb->s_vfs_rename_mutex); | ||
| 109 | 105 | ||
| 110 | if (!full_path) | 106 | if (!full_path) |
| 111 | goto out_no_free; | 107 | goto out_no_free; |
| @@ -164,9 +160,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname) | |||
| 164 | cifs_sb = CIFS_SB(inode->i_sb); | 160 | cifs_sb = CIFS_SB(inode->i_sb); |
| 165 | pTcon = cifs_sb->tcon; | 161 | pTcon = cifs_sb->tcon; |
| 166 | 162 | ||
| 167 | mutex_lock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 168 | full_path = build_path_from_dentry(direntry); | 163 | full_path = build_path_from_dentry(direntry); |
| 169 | mutex_unlock(&inode->i_sb->s_vfs_rename_mutex); | ||
| 170 | 164 | ||
| 171 | if(full_path == NULL) { | 165 | if(full_path == NULL) { |
| 172 | FreeXid(xid); | 166 | FreeXid(xid); |
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 2f6e2825571e..7b8591acc5ad 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
| @@ -404,9 +404,7 @@ static int initiate_cifs_search(const int xid, struct file *file) | |||
| 404 | if(pTcon == NULL) | 404 | if(pTcon == NULL) |
| 405 | return -EINVAL; | 405 | return -EINVAL; |
| 406 | 406 | ||
| 407 | mutex_lock(&file->f_dentry->d_sb->s_vfs_rename_mutex); | ||
| 408 | full_path = build_path_from_dentry(file->f_dentry); | 407 | full_path = build_path_from_dentry(file->f_dentry); |
| 409 | mutex_unlock(&file->f_dentry->d_sb->s_vfs_rename_mutex); | ||
| 410 | 408 | ||
| 411 | if(full_path == NULL) { | 409 | if(full_path == NULL) { |
| 412 | return -ENOMEM; | 410 | return -ENOMEM; |
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c index 3938444d87b2..7754d641775e 100644 --- a/fs/cifs/xattr.c +++ b/fs/cifs/xattr.c | |||
| @@ -62,9 +62,7 @@ int cifs_removexattr(struct dentry * direntry, const char * ea_name) | |||
| 62 | cifs_sb = CIFS_SB(sb); | 62 | cifs_sb = CIFS_SB(sb); |
| 63 | pTcon = cifs_sb->tcon; | 63 | pTcon = cifs_sb->tcon; |
| 64 | 64 | ||
| 65 | mutex_lock(&sb->s_vfs_rename_mutex); | ||
| 66 | full_path = build_path_from_dentry(direntry); | 65 | full_path = build_path_from_dentry(direntry); |
| 67 | mutex_unlock(&sb->s_vfs_rename_mutex); | ||
| 68 | if(full_path == NULL) { | 66 | if(full_path == NULL) { |
| 69 | FreeXid(xid); | 67 | FreeXid(xid); |
| 70 | return -ENOMEM; | 68 | return -ENOMEM; |
| @@ -116,9 +114,7 @@ int cifs_setxattr(struct dentry * direntry, const char * ea_name, | |||
| 116 | cifs_sb = CIFS_SB(sb); | 114 | cifs_sb = CIFS_SB(sb); |
| 117 | pTcon = cifs_sb->tcon; | 115 | pTcon = cifs_sb->tcon; |
| 118 | 116 | ||
| 119 | mutex_lock(&sb->s_vfs_rename_mutex); | ||
| 120 | full_path = build_path_from_dentry(direntry); | 117 | full_path = build_path_from_dentry(direntry); |
| 121 | mutex_unlock(&sb->s_vfs_rename_mutex); | ||
| 122 | if(full_path == NULL) { | 118 | if(full_path == NULL) { |
| 123 | FreeXid(xid); | 119 | FreeXid(xid); |
| 124 | return -ENOMEM; | 120 | return -ENOMEM; |
| @@ -223,9 +219,7 @@ ssize_t cifs_getxattr(struct dentry * direntry, const char * ea_name, | |||
| 223 | cifs_sb = CIFS_SB(sb); | 219 | cifs_sb = CIFS_SB(sb); |
| 224 | pTcon = cifs_sb->tcon; | 220 | pTcon = cifs_sb->tcon; |
| 225 | 221 | ||
| 226 | mutex_lock(&sb->s_vfs_rename_mutex); | ||
| 227 | full_path = build_path_from_dentry(direntry); | 222 | full_path = build_path_from_dentry(direntry); |
| 228 | mutex_unlock(&sb->s_vfs_rename_mutex); | ||
| 229 | if(full_path == NULL) { | 223 | if(full_path == NULL) { |
| 230 | FreeXid(xid); | 224 | FreeXid(xid); |
| 231 | return -ENOMEM; | 225 | return -ENOMEM; |
| @@ -341,9 +335,7 @@ ssize_t cifs_listxattr(struct dentry * direntry, char * data, size_t buf_size) | |||
| 341 | cifs_sb = CIFS_SB(sb); | 335 | cifs_sb = CIFS_SB(sb); |
| 342 | pTcon = cifs_sb->tcon; | 336 | pTcon = cifs_sb->tcon; |
| 343 | 337 | ||
| 344 | mutex_lock(&sb->s_vfs_rename_mutex); | ||
| 345 | full_path = build_path_from_dentry(direntry); | 338 | full_path = build_path_from_dentry(direntry); |
| 346 | mutex_unlock(&sb->s_vfs_rename_mutex); | ||
| 347 | if(full_path == NULL) { | 339 | if(full_path == NULL) { |
| 348 | FreeXid(xid); | 340 | FreeXid(xid); |
| 349 | return -ENOMEM; | 341 | return -ENOMEM; |
