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
This commit is contained in:
commit
b95a568093
2 changed files with 2 additions and 3 deletions
|
@ -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();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue