aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/vfs.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-06-08 20:05:18 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-06-08 20:05:18 -0400
commit44b56603c4c476b845a824cff6fe905c6268b2a1 (patch)
treeb7e792414fef2390718a657765719fbbb529ce84 /fs/nfsd/vfs.c
parentc3935e30495869dd611e1cd62253c94ebc7c6c04 (diff)
parentb160fdabe93a8a53094f90f02bf4dcb500782aab (diff)
downloadmrst-s0i3-test-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.gz
mrst-s0i3-test-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.xz
mrst-s0i3-test-44b56603c4c476b845a824cff6fe905c6268b2a1.zip
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r--fs/nfsd/vfs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 23c06f77f4c..4eb9baa3308 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,
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;