diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 15:43:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 15:43:04 -0400 |
| commit | b95a56809343fb727c818ad1b9da14a17fa92ef6 (patch) | |
| tree | b79ff0d36f216fcadce546aa33219e06f1126b58 /fs/nfsd/vfs.c | |
| parent | a7f5378e2449fc8ae3f92739a6cc2239748ef86a (diff) | |
| parent | 44b56603c4c476b845a824cff6fe905c6268b2a1 (diff) | |
Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.35' of git://linux-nfs.org/~bfields/linux:
nfsd4: shut down callback queue outside state lock
nfsd: nfsd_setattr needs to call commit_metadata
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 | ||