nfsd: remove unnecessary positive-dentry check
authorJ. Bruce Fields <bfields@redhat.com>
Fri, 22 Jul 2016 01:55:42 +0000 (21:55 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 4 Aug 2016 21:11:50 +0000 (17:11 -0400)
vfs_{create,mkdir,mknod} each begin with a call to may_create(), which
returns EEXIST if the object already exists.

This check is therefore unnecessary.

(In the NFSv2 case, nfsd_proc_create also has such a check.  Contrary to
RFC 1094, our code seems to believe that a CREATE of an existing file
should succeed.  I'm leaving that behavior alone.)

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/vfs.c

index d21d082..c957094 100644 (file)
@@ -1157,17 +1157,7 @@ nfsd_create_locked(struct svc_rqst *rqstp, struct svc_fh *fhp,
                err = nfserr_io;
                goto out;
        }
-       /*
-        * Make sure the child dentry is still negative ...
-        */
-       err = nfserr_exist;
-       if (d_really_is_positive(dchild)) {
-               dprintk("nfsd_create: dentry %pd/%pd not negative!\n",
-                       dentry, dchild);
-               goto out; 
-       }
 
-       /* Now let's see if we actually have permissions to create */
        err = nfsd_permission(rqstp, fhp->fh_export, dentry, NFSD_MAY_CREATE);
        if (err)
                goto out;