Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ddeb7c5 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Propagate the error NFS4ERR_BADOWNER to nfs4_do_setattr 



This will be required in order to switch uid/gid mapping back on if the
admin has tried to disable it.

Note that we also propagate NFS4ERR_BADNAME at the same time, in order to
work around a Linux server bug.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent e4fd72a1

fs/nfs/nfs4proc.c

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ static int nfs4_map_errors(int err) 
	switch (err) {

	case -NFS4ERR_RESOURCE:

		return -EREMOTEIO;

	case -NFS4ERR_BADOWNER:

	case -NFS4ERR_BADNAME:

		return -EINVAL;

	default:

		dprintk("%s could not handle NFSv4 error %d\n",

				__func__, -err);

fs/nfs/nfs4xdr.c

+0 −2
Original line number Diff line number Diff line
@@ -6171,8 +6171,6 @@ static struct { 
	{ NFS4ERR_DQUOT,	-EDQUOT		},

	{ NFS4ERR_STALE,	-ESTALE		},

	{ NFS4ERR_BADHANDLE,	-EBADHANDLE	},

	{ NFS4ERR_BADOWNER,	-EINVAL		},

	{ NFS4ERR_BADNAME,	-EINVAL		},

	{ NFS4ERR_BAD_COOKIE,	-EBADCOOKIE	},

	{ NFS4ERR_NOTSUPP,	-ENOTSUPP	},

	{ NFS4ERR_TOOSMALL,	-ETOOSMALL	},