Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming

This commit is contained in:
J. Bruce Fields
2010-06-08 20:05:18 -04:00
424 changed files with 3780 additions and 2241 deletions

View File

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