From 12391d07230ec7368269227207b961b2dcb34180 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 19 Jul 2016 17:25:42 -0400 Subject: [PATCH] nfsd: remove redundant zero-length check from create lookup_one_len already has this check. The only effect of this patch is to return access instead of perm in the 0-length-filename case. I actually prefer nfserr_perm (or _inval?), but I doubt anyone cares. The isdotent check seems redundant too, but I worry that some client might actually care about that strange nfserr_exist error. Signed-off-by: J. Bruce Fields --- fs/nfsd/nfsproc.c | 3 --- fs/nfsd/vfs.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 4cd78ef4c95c..6722fe52ea15 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -251,9 +251,6 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, /* Check for NFSD_MAY_WRITE in nfsd_create if necessary */ - nfserr = nfserr_acces; - if (!argp->len) - goto done; nfserr = nfserr_exist; if (isdotent(argp->name, argp->len)) goto done; diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index fda4f86161f8..fba8e7e521e0 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1154,9 +1154,6 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, __be32 err2; int host_err; - err = nfserr_perm; - if (!flen) - goto out; err = nfserr_exist; if (isdotent(fname, flen)) goto out; -- GitLab