Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 722b620d authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

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: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 2dd6e458

fs/nfsd/vfs.c

+2 −2
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, 
	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.