diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-25 21:17:17 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:43:56 -0400 |
commit | dd7dd556e45133ef13f2c4bddc0e0b1ac23bc0e4 (patch) | |
tree | 4884b6af570a2a0cb01d11f39a38a3a9c73e49ba /fs/cifs/dir.c | |
parent | bf6c7f6c7bd0ea779757d35b5fdc9f9157f056b3 (diff) |
no need to check for LOOKUP_OPEN in ->create() instances
... it will be set in nd->flag for all cases with non-NULL nd
(i.e. when called from do_last()).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs/dir.c')
-rw-r--r-- | fs/cifs/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index fa8c21d913bc..8766149f6300 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
@@ -179,7 +179,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, | |||
179 | if (oplockEnabled) | 179 | if (oplockEnabled) |
180 | oplock = REQ_OPLOCK; | 180 | oplock = REQ_OPLOCK; |
181 | 181 | ||
182 | if (nd && (nd->flags & LOOKUP_OPEN)) | 182 | if (nd) |
183 | oflags = nd->intent.open.file->f_flags; | 183 | oflags = nd->intent.open.file->f_flags; |
184 | else | 184 | else |
185 | oflags = O_RDONLY | O_CREAT; | 185 | oflags = O_RDONLY | O_CREAT; |
@@ -214,7 +214,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, | |||
214 | which should be rare for path not covered on files) */ | 214 | which should be rare for path not covered on files) */ |
215 | } | 215 | } |
216 | 216 | ||
217 | if (nd && (nd->flags & LOOKUP_OPEN)) { | 217 | if (nd) { |
218 | /* if the file is going to stay open, then we | 218 | /* if the file is going to stay open, then we |
219 | need to set the desired access properly */ | 219 | need to set the desired access properly */ |
220 | desiredAccess = 0; | 220 | desiredAccess = 0; |
@@ -328,7 +328,7 @@ cifs_create_set_dentry: | |||
328 | else | 328 | else |
329 | cFYI(1, "Create worked, get_inode_info failed rc = %d", rc); | 329 | cFYI(1, "Create worked, get_inode_info failed rc = %d", rc); |
330 | 330 | ||
331 | if (newinode && nd && (nd->flags & LOOKUP_OPEN)) { | 331 | if (newinode && nd) { |
332 | struct cifsFileInfo *pfile_info; | 332 | struct cifsFileInfo *pfile_info; |
333 | struct file *filp; | 333 | struct file *filp; |
334 | 334 | ||