diff options
| author | Jeff Layton | 2014-07-03 13:54:19 +0200 |
|---|---|---|
| committer | J. Bruce Fields | 2014-07-10 02:55:02 +0200 |
| commit | 722b620d1830fce69367b099ef6a83f41a4b9d72 (patch) | |
| tree | 534019b423e751a7c3510ac635f6b901fff5b74d /fs/nfsd/vfs.c | |
| parent | nfsd: Cleanup - Let nfsd4_lookup_stateid() take a cstate argument (diff) | |
| download | kernel-qcow2-linux-722b620d1830fce69367b099ef6a83f41a4b9d72.tar.gz kernel-qcow2-linux-722b620d1830fce69367b099ef6a83f41a4b9d72.tar.xz kernel-qcow2-linux-722b620d1830fce69367b099ef6a83f41a4b9d72.zip | |
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 <trond.myklebust@primarydata.com>
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 4 |
1 files 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. |