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>

diff --git a/fs/smb/client/dir.c b/fs/smb/client/dir.c
index 5223edf6d11a5b87d799e0e70d6becffda456c42..47710aa13822a0abff4ed87415f8464c73dd3583 100644 (file)
--- a/fs/smb/client/dir.c
+++ b/fs/smb/client/dir.c
@@ -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();