diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-06-16 09:19:36 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-06-16 09:19:36 -0400 |
| commit | 0933a95dfdb1ae5c93e1ede5899f35acc2bb244d (patch) | |
| tree | 55ac47b819a2a2084f82f9d823d9152ac2a7f2b3 /fs/nfsd/vfs.c | |
| parent | 12420ac341533f3715b3deb788637568f22b78ff (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 | ||