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

Commit 5b648699 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: READ, READDIR, etc., are idempotent 



OP_MODIFIES_SOMETHING flags operations that we should be careful not to
initiate without being sure we have the buffer space to encode a reply.

None of these ops fall into that category.

We could probably remove a few more, but this isn't a very important
problem at least for ops whose reply size is easy to estimate.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 8658452e

fs/nfsd/nfs4proc.c

+3 −8
Original line number Diff line number Diff line
@@ -1665,37 +1665,32 @@ static struct nfsd4_operation nfsd4_ops[] = { 
	[OP_PUTFH] = {

		.op_func = (nfsd4op_func)nfsd4_putfh,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS

				| OP_IS_PUTFH_LIKE | OP_MODIFIES_SOMETHING

				| OP_CLEAR_STATEID,

				| OP_IS_PUTFH_LIKE | OP_CLEAR_STATEID,

		.op_name = "OP_PUTFH",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_only_status_rsize,

	},

	[OP_PUTPUBFH] = {

		.op_func = (nfsd4op_func)nfsd4_putrootfh,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS

				| OP_IS_PUTFH_LIKE | OP_MODIFIES_SOMETHING

				| OP_CLEAR_STATEID,

				| OP_IS_PUTFH_LIKE | OP_CLEAR_STATEID,

		.op_name = "OP_PUTPUBFH",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_only_status_rsize,

	},

	[OP_PUTROOTFH] = {

		.op_func = (nfsd4op_func)nfsd4_putrootfh,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS

				| OP_IS_PUTFH_LIKE | OP_MODIFIES_SOMETHING

				| OP_CLEAR_STATEID,

				| OP_IS_PUTFH_LIKE | OP_CLEAR_STATEID,

		.op_name = "OP_PUTROOTFH",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_only_status_rsize,

	},

	[OP_READ] = {

		.op_func = (nfsd4op_func)nfsd4_read,

		.op_flags = OP_MODIFIES_SOMETHING,

		.op_name = "OP_READ",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_read_rsize,

		.op_get_currentstateid = (stateid_getter)nfsd4_get_readstateid,

	},

	[OP_READDIR] = {

		.op_func = (nfsd4op_func)nfsd4_readdir,

		.op_flags = OP_MODIFIES_SOMETHING,

		.op_name = "OP_READDIR",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_readdir_rsize,

	},