2014-07-03 11:54:27

by Jeff Layton

Subject: [PATCH] nfsd: properly convert return from commit_metadata to __be32

Commit 2a7420c03e504 (nfsd: Ensure that nfsd_create_setattr commits
files to stable storage), added a couple of calls to commit_metadata,
but doesn't convert their return codes to __be32 in the appropriate
places.

Cc: Trond Myklebust <[email protected]>
Signed-off-by: Jeff Layton <[email protected]>
---
fs/nfsd/vfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index e1b792ada45b..f501a9b5c9df 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -463,7 +463,7 @@ out_put_write_access:
if (size_change)
put_write_access(inode);
if (!err)
- err = commit_metadata(fhp);
+ err = nfserrno(commit_metadata(fhp));
out:
return err;
}
@@ -1122,7 +1122,7 @@ nfsd_create_setattr(struct svc_rqst *rqstp, struct svc_fh *resfhp,
if (iap->ia_valid)
return nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0);
/* Callers expect file metadata to be committed here */
- return commit_metadata(resfhp);
+ return nfserrno(commit_metadata(resfhp));
}

/* HPUX client sometimes creates a file in mode 000, and sets size to 0.
--
1.9.3

2014-07-03 14:38:19

by J. Bruce Fields

Subject: Re: [PATCH] nfsd: properly convert return from commit_metadata to __be32

On Thu, Jul 03, 2014 at 07:54:19AM -0400, Jeff Layton wrote:
> Commit 2a7420c03e504 (nfsd: Ensure that nfsd_create_setattr commits
> files to stable storage), added a couple of calls to commit_metadata,
> but doesn't convert their return codes to __be32 in the appropriate
> places.

Thanks, applying.--b.

>
> Cc: Trond Myklebust <[email protected]>
> Signed-off-by: Jeff Layton <[email protected]>
> ---
> fs/nfsd/vfs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index e1b792ada45b..f501a9b5c9df 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -463,7 +463,7 @@ out_put_write_access:
> if (size_change)
> put_write_access(inode);
> if (!err)
> - err = commit_metadata(fhp);
> + err = nfserrno(commit_metadata(fhp));
> out:
> return err;
> }
> @@ -1122,7 +1122,7 @@ nfsd_create_setattr(struct svc_rqst *rqstp, struct svc_fh *resfhp,
> if (iap->ia_valid)
> return nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0);
> /* Callers expect file metadata to be committed here */
> - return commit_metadata(resfhp);
> + return nfserrno(commit_metadata(resfhp));
> }
>
> /* HPUX client sometimes creates a file in mode 000, and sets size to 0.
> --
> 1.9.3
>

2014-07-03 13:28:49

by Trond Myklebust

Subject: Re: [PATCH] nfsd: properly convert return from commit_metadata to __be32

On Thu, Jul 3, 2014 at 7:54 AM, Jeff Layton <[email protected]> wrote:
> Commit 2a7420c03e504 (nfsd: Ensure that nfsd_create_setattr commits
> files to stable storage), added a couple of calls to commit_metadata,
> but doesn't convert their return codes to __be32 in the appropriate
> places.
>
> Cc: Trond Myklebust <[email protected]>
> Signed-off-by: Jeff Layton <[email protected]>
> ---
> fs/nfsd/vfs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index e1b792ada45b..f501a9b5c9df 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -463,7 +463,7 @@ out_put_write_access:
> if (size_change)
> put_write_access(inode);
> if (!err)
> - err = commit_metadata(fhp);
> + err = nfserrno(commit_metadata(fhp));
> out:
> return err;
> }
> @@ -1122,7 +1122,7 @@ nfsd_create_setattr(struct svc_rqst *rqstp, struct svc_fh *resfhp,
> if (iap->ia_valid)
> return nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0);
> /* Callers expect file metadata to be committed here */
> - return commit_metadata(resfhp);
> + return nfserrno(commit_metadata(resfhp));
> }
>
> /* HPUX client sometimes creates a file in mode 000, and sets size to 0.
> --
> 1.9.3
>

Doh! Thanks Jeff!...

--
Trond Myklebust

Linux NFS client maintainer, PrimaryData

[email protected]