diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-06-28 08:47:04 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-06-28 08:47:04 -0400 |
| commit | 41bd03ba0758a076671e5de35ed084535984143d (patch) | |
| tree | 9a669f9f1f52996b38acb077655e4b044bba67c7 /fs/nfsd/vfs.c | |
| parent | 090830b4c79cd5ac85430822a9b87c90848bedcf (diff) | |
| parent | dc75925d67950889b79df1cc1518c21ec678df6c (diff) | |
Merge branch 'for_2.6.35rc' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index ebbf3b6b2457..3c111120b619 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -443,8 +443,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, | |||
| 443 | if (size_change) | 443 | if (size_change) |
| 444 | put_write_access(inode); | 444 | put_write_access(inode); |
| 445 | if (!err) | 445 | if (!err) |
| 446 | if (EX_ISSYNC(fhp->fh_export)) | 446 | commit_metadata(fhp); |
| 447 | write_inode_now(inode, 1); | ||
| 448 | out: | 447 | out: |
| 449 | return err; | 448 | return err; |
| 450 | 449 | ||