diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 10:46:31 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 10:46:35 +0200 |
commit | 4cb6948e5365ab874bb71ac35fb6b7c6dd305765 (patch) | |
tree | 0af0f44cce9043f3d66b7259536c6c99b790d9b0 /fs/nfsd/vfs.c | |
parent | 89275d59b572b92b1e2f6ddb63c49deecb801ff9 (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
download | blackbird-op-linux-4cb6948e5365ab874bb71ac35fb6b7c6dd305765.tar.gz blackbird-op-linux-4cb6948e5365ab874bb71ac35fb6b7c6dd305765.zip |
Merge commit 'v2.6.35-rc3' into sched/core
Merge reason: Update to the latest -rc.
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, 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; |