Commit b160fdab authored Jun 01, 2010 by Christoph Hellwig Committed by J. Bruce Fields Jun 01, 2010

nfsd: nfsd_setattr needs to call commit_metadata



The conversion of write_inode_now calls to commit_metadata in commit
f501912a missed out the call in nfsd_setattr.

But without this conversion we can't guarantee that a SETATTR request
has actually been commited to disk with XFS, which causes a regression
from 2.6.32 (only for NFSv2, but anyway).

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

parent e40152ee

fs/nfsd/vfs.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -443,8 +443,7 @@ nfsd_setattr(struct svc_rqst rqstp, struct svc_fh fhp, struct iattr *iap,
	if (size_change)		if (size_change)
	put_write_access(inode);		put_write_access(inode);
	if (!err)		if (!err)
	if (EX_ISSYNC(fhp->fh_export))		commit_metadata(fhp);
	write_inode_now(inode, 1);
	out:		out:
	return err;		return err;