From d03d9fe476ea81ad3be25967ef35a671dbd79b55 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Thu, 21 Jul 2016 21:55:42 -0400 Subject: nfsd: remove unnecessary positive-dentry check 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 --- fs/nfsd/vfs.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index d21d082..c957094 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -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; -- cgit v1.1