| Message ID | 20221017204950.490306-1-jlayton@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nfsd: remove weird compile-time conditional for EDQUOT | expand |
On Mon, 2022-10-17 at 16:49 -0400, Jeff Layton wrote: > I don't see any other places in the kernel that test for this symbol > before trying to use it. Remove the #ifdef. > > Cc: David Howells <dhowells@redhat.com> > Signed-off-by: Jeff Layton <jlayton@kernel.org> > --- > fs/nfsd/vfs.c | 2 -- > 1 file changed, 2 deletions(-) > > This builds for me, but I'm on a "standard" arch (x86_64). I think we'll > just have to put this in linux-next and see if any exotic arches or > configurations barf on it. > > diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c > index 27dd9ac992ee..bee6f4a32f3b 100644 > --- a/fs/nfsd/vfs.c > +++ b/fs/nfsd/vfs.c > @@ -84,9 +84,7 @@ nfserrno (int errno) > { nfserr_mlink, -EMLINK }, > { nfserr_nametoolong, -ENAMETOOLONG }, > { nfserr_notempty, -ENOTEMPTY }, > -#ifdef EDQUOT > { nfserr_dquot, -EDQUOT }, > -#endif > { nfserr_stale, -ESTALE }, > { nfserr_jukebox, -ETIMEDOUT }, > { nfserr_jukebox, -ERESTARTSYS }, I did a bit more archaeology... It looks like this #ifdef dates back to the original merge of nfsd into the kernel in v2.1.32 (~Mar 10th 1997)! I think we can safely dispense with it now that EDQUOT is a full-fledged errno value and has been for ages.
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 27dd9ac992ee..bee6f4a32f3b 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -84,9 +84,7 @@ nfserrno (int errno) { nfserr_mlink, -EMLINK }, { nfserr_nametoolong, -ENAMETOOLONG }, { nfserr_notempty, -ENOTEMPTY }, -#ifdef EDQUOT { nfserr_dquot, -EDQUOT }, -#endif { nfserr_stale, -ESTALE }, { nfserr_jukebox, -ETIMEDOUT }, { nfserr_jukebox, -ERESTARTSYS },
I don't see any other places in the kernel that test for this symbol before trying to use it. Remove the #ifdef. Cc: David Howells <dhowells@redhat.com> Signed-off-by: Jeff Layton <jlayton@kernel.org> --- fs/nfsd/vfs.c | 2 -- 1 file changed, 2 deletions(-) This builds for me, but I'm on a "standard" arch (x86_64). I think we'll just have to put this in linux-next and see if any exotic arches or configurations barf on it.