2018-12-04 19:09:25

by Olga Kornievskaia

Subject: [PATCH 1/1] NFSD remove OP_CACHEME from 4.2 op_flags

From: Olga Kornievskaia <[email protected]>

OP_CACHEME is only for the 4.0 operations.

Signed-off-by: Olga Kornievskaia <[email protected]>
---
fs/nfsd/nfs4proc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 238c4b7..60c4650 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -3010,25 +3010,25 @@ static inline u32 nfsd4_seek_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
/* NFSv4.2 operations */
[OP_ALLOCATE] = {
.op_func = nfsd4_allocate,
- .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
+ .op_flags = OP_MODIFIES_SOMETHING,
.op_name = "OP_ALLOCATE",
.op_rsize_bop = nfsd4_only_status_rsize,
},
[OP_DEALLOCATE] = {
.op_func = nfsd4_deallocate,
- .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
+ .op_flags = OP_MODIFIES_SOMETHING,
.op_name = "OP_DEALLOCATE",
.op_rsize_bop = nfsd4_only_status_rsize,
},
[OP_CLONE] = {
.op_func = nfsd4_clone,
- .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
+ .op_flags = OP_MODIFIES_SOMETHING,
.op_name = "OP_CLONE",
.op_rsize_bop = nfsd4_only_status_rsize,
},
[OP_COPY] = {
.op_func = nfsd4_copy,
- .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
+ .op_flags = OP_MODIFIES_SOMETHING,
.op_name = "OP_COPY",
.op_rsize_bop = nfsd4_copy_rsize,
},
--
1.8.3.1

2018-12-14 14:45:34

by J. Bruce Fields

Subject: Re: [PATCH 1/1] NFSD remove OP_CACHEME from 4.2 op_flags

Thanks, applying for 4.21.--b.

On Tue, Dec 04, 2018 at 02:09:21PM -0500, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <[email protected]>
>
> OP_CACHEME is only for the 4.0 operations.
>
> Signed-off-by: Olga Kornievskaia <[email protected]>
> ---
> fs/nfsd/nfs4proc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index 238c4b7..60c4650 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -3010,25 +3010,25 @@ static inline u32 nfsd4_seek_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
> /* NFSv4.2 operations */
> [OP_ALLOCATE] = {
> .op_func = nfsd4_allocate,
> - .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
> + .op_flags = OP_MODIFIES_SOMETHING,
> .op_name = "OP_ALLOCATE",
> .op_rsize_bop = nfsd4_only_status_rsize,
> },
> [OP_DEALLOCATE] = {
> .op_func = nfsd4_deallocate,
> - .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
> + .op_flags = OP_MODIFIES_SOMETHING,
> .op_name = "OP_DEALLOCATE",
> .op_rsize_bop = nfsd4_only_status_rsize,
> },
> [OP_CLONE] = {
> .op_func = nfsd4_clone,
> - .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
> + .op_flags = OP_MODIFIES_SOMETHING,
> .op_name = "OP_CLONE",
> .op_rsize_bop = nfsd4_only_status_rsize,
> },
> [OP_COPY] = {
> .op_func = nfsd4_copy,
> - .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
> + .op_flags = OP_MODIFIES_SOMETHING,
> .op_name = "OP_COPY",
> .op_rsize_bop = nfsd4_copy_rsize,
> },
> --
> 1.8.3.1