diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
| commit | 7894eaf291238a62a565e9e9777483beeb00eeae (patch) | |
| tree | 43c08830d2030d39d719f3f3d54a0e9b36554770 /fs/cifs/fcntl.c | |
| parent | 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into irq-pio
Diffstat (limited to 'fs/cifs/fcntl.c')
| -rw-r--r-- | fs/cifs/fcntl.c | 2 |
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; |
