2018-07-17 18:36:14

by Eric Biggers

Subject: [PATCH] nfsd: constify write_op[]

From: Eric Biggers <[email protected]>

write_op[] is never modified, so make it 'const'.

Signed-off-by: Eric Biggers <[email protected]>
---
fs/nfsd/nfsctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 2c46451c7d60..19aa4ded2590 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -73,7 +73,7 @@ static ssize_t write_recoverydir(struct file *file, char *buf, size_t size);
static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size);
#endif

-static ssize_t (*write_op[])(struct file *, char *, size_t) = {
+static ssize_t (*const write_op[])(struct file *, char *, size_t) = {
[NFSD_Fh] = write_filehandle,
[NFSD_FO_UnlockIP] = write_unlock_ip,
[NFSD_FO_UnlockFS] = write_unlock_fs,
--
2.18.0.203.gfac676dfb9-goog

2018-08-01 17:17:51

by J. Bruce Fields

Subject: Re: [PATCH] nfsd: constify write_op[]

On Tue, Jul 17, 2018 at 11:01:25AM -0700, Eric Biggers wrote:
> From: Eric Biggers <[email protected]>
>
> write_op[] is never modified, so make it 'const'.

Thanks, applying for 2.19.--b.

>
> Signed-off-by: Eric Biggers <[email protected]>
> ---
> fs/nfsd/nfsctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index 2c46451c7d60..19aa4ded2590 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -73,7 +73,7 @@ static ssize_t write_recoverydir(struct file *file, char *buf, size_t size);
> static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size);
> #endif
>
> -static ssize_t (*write_op[])(struct file *, char *, size_t) = {
> +static ssize_t (*const write_op[])(struct file *, char *, size_t) = {
> [NFSD_Fh] = write_filehandle,
> [NFSD_FO_UnlockIP] = write_unlock_ip,
> [NFSD_FO_UnlockFS] = write_unlock_fs,
> --
> 2.18.0.203.gfac676dfb9-goog