summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-09 12:43:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-09 12:43:04 -0700
commitb95a56809343fb727c818ad1b9da14a17fa92ef6 (patch)
treeb79ff0d36f216fcadce546aa33219e06f1126b58
parenta7f5378e2449fc8ae3f92739a6cc2239748ef86a (diff)
parent44b56603c4c476b845a824cff6fe905c6268b2a1 (diff)
downloadlinux-3.10-b95a56809343fb727c818ad1b9da14a17fa92ef6.tar.gz
linux-3.10-b95a56809343fb727c818ad1b9da14a17fa92ef6.tar.bz2
linux-3.10-b95a56809343fb727c818ad1b9da14a17fa92ef6.zip
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
-rw-r--r--fs/nfsd/nfs4state.c2
-rw-r--r--fs/nfsd/vfs.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 12f7109720c..4a273475877 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4122,8 +4122,8 @@ nfs4_state_shutdown(void)
nfs4_lock_state();
nfs4_release_reclaim();
__nfs4_state_shutdown();
- nfsd4_destroy_callback_queue();
nfs4_unlock_state();
+ nfsd4_destroy_callback_queue();
}
/*
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index ebbf3b6b245..3c111120b61 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;