Browse Source

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>
Jeff Layton 11 years ago
parent
commit
722b620d18
1 changed files with 2 additions and 2 deletions
  1. 2 2
      fs/nfsd/vfs.c

+ 2 - 2
fs/nfsd/vfs.c

@@ -463,7 +463,7 @@ out_put_write_access:
 	if (size_change)
 	if (size_change)
 		put_write_access(inode);
 		put_write_access(inode);
 	if (!err)
 	if (!err)
-		err = commit_metadata(fhp);
+		err = nfserrno(commit_metadata(fhp));
 out:
 out:
 	return err;
 	return err;
 }
 }
@@ -1122,7 +1122,7 @@ nfsd_create_setattr(struct svc_rqst *rqstp, struct svc_fh *resfhp,
 	if (iap->ia_valid)
 	if (iap->ia_valid)
 		return nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0);
 		return nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0);
 	/* Callers expect file metadata to be committed here */
 	/* 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.
 /* HPUX client sometimes creates a file in mode 000, and sets size to 0.