diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-09 02:05:18 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-09 02:05:18 +0200 |
| commit | 44b56603c4c476b845a824cff6fe905c6268b2a1 (patch) | |
| tree | b7e792414fef2390718a657765719fbbb529ce84 /fs/nfsd | |
| parent | nfsd4: shut down callback queue outside state lock (diff) | |
| parent | nfsd: nfsd_setattr needs to call commit_metadata (diff) | |
| download | linux-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.xz linux-44b56603c4c476b845a824cff6fe905c6268b2a1.zip | |
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'fs/nfsd')
| -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 23c06f77f4ca..4eb9baa33081 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; |