aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/fcntl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-23 12:38:09 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-23 12:38:09 -0400
commit41bc3982b99973d93b5c49598ebd1c34a21127af (patch)
tree8cb529778bd896e96cc0700b49f593ef3a4d0b9d /fs/cifs/fcntl.c
parenta580e5b9a5ba7d6db5647c36ee118b8890ba3033 (diff)
parentb66ac3ea21f81dea02cdb4e9de66ee6afdc540e4 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable: [CIFS] Fix typo in previous [CIFS] Readdir fixes to allow search to start at arbitrary position [CIFS] Use the kthread_ API instead of opencoding lots of hairy code for kernel [CIFS] Don't allow a backslash in a path component [CIFS] [CIFS] Do not take rename sem on most path based calls (during
Diffstat (limited to 'fs/cifs/fcntl.c')
-rw-r--r--fs/cifs/fcntl.c2
1 files changed, 0 insertions, 2 deletions
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;