tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds b95a5680 a7f5378e

+2 -3
unified split
+1 -1
fs/nfsd/nfs4state.c
··· 4122 4122 nfs4_lock_state(); 4123 4123 nfs4_release_reclaim(); 4124 4124 __nfs4_state_shutdown(); 4125 - nfsd4_destroy_callback_queue(); 4126 4125 nfs4_unlock_state(); 4126 + nfsd4_destroy_callback_queue(); 4127 4127 } 4128 4128 4129 4129 /*
+1 -2
fs/nfsd/vfs.c
··· 443 443 if (size_change) 444 444 put_write_access(inode); 445 445 if (!err) 446 - if (EX_ISSYNC(fhp->fh_export)) 447 - write_inode_now(inode, 1); 446 + commit_metadata(fhp); 448 447 out: 449 448 return err; 450 449