diff options
author | Jeff Layton <jlayton@redhat.com> | 2009-07-05 11:01:02 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2009-07-08 17:55:45 -0400 |
commit | 5ddf1e0ff00fd808c048d0b920784828276cc516 (patch) | |
tree | 3510f7e7274700478444ad277f7025519417c7ea /fs | |
parent | cc0bad7552308e8905d6ea56e6b7811fa67e716d (diff) |
cifs: fix regression with O_EXCL creates and optimize away lookup
cifs: fix regression with O_EXCL creates and optimize away lookup
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Tested-by: Shirish Pargaonkar <shirishp@gmail.com>
CC: Stable Kernel <stable@kernel.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/dir.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index a40054faed7f..ff55fc6932cb 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
@@ -643,6 +643,15 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, | |||
643 | } | 643 | } |
644 | } | 644 | } |
645 | 645 | ||
646 | /* | ||
647 | * O_EXCL: optimize away the lookup, but don't hash the dentry. Let | ||
648 | * the VFS handle the create. | ||
649 | */ | ||
650 | if (nd->flags & LOOKUP_EXCL) { | ||
651 | d_instantiate(direntry, NULL); | ||
652 | return 0; | ||
653 | } | ||
654 | |||
646 | /* can not grab the rename sem here since it would | 655 | /* can not grab the rename sem here since it would |
647 | deadlock in the cases (beginning of sys_rename itself) | 656 | deadlock in the cases (beginning of sys_rename itself) |
648 | in which we already have the sb rename sem */ | 657 | in which we already have the sb rename sem */ |