mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 10:01:39 -05:00
simplify cifs_atomic_open()
now that finish_no_open() does the right thing if it's given ERR_PTR() as dentry... Reviewed-by: NeilBrown <neil@brown.name> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -484,8 +484,6 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
|
||||
* in network traffic in the other paths.
|
||||
*/
|
||||
if (!(oflags & O_CREAT)) {
|
||||
struct dentry *res;
|
||||
|
||||
/*
|
||||
* Check for hashed negative dentry. We have already revalidated
|
||||
* the dentry and it is fine. No need to perform another lookup.
|
||||
@@ -493,11 +491,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
|
||||
if (!d_in_lookup(direntry))
|
||||
return -ENOENT;
|
||||
|
||||
res = cifs_lookup(inode, direntry, 0);
|
||||
if (IS_ERR(res))
|
||||
return PTR_ERR(res);
|
||||
|
||||
return finish_no_open(file, res);
|
||||
return finish_no_open(file, cifs_lookup(inode, direntry, 0));
|
||||
}
|
||||
|
||||
xid = get_xid();
|
||||
|
||||
Reference in New Issue
Block a user