These patches clean up some issues surrouding nfs_page_group_lock: - normalize wait/nonblock argument - make nonblocking calls really nonblocking - handle errors - ensure that we don't call blocking nfs_page_group_lock when holding the inode spinlock This cleanup was inspired by Fengguang Wu's report that we were sleeping with locks held in nfs_lock_and_join_requests. Weston Andros Adamson (5): nfs: change nfs_page_group_lock argument nfs: fix nonblocking calls to nfs_page_group_lock nfs: use blocking page_group_lock in add_request nfs: fix error handling in lock_and_join_requests nfs: don't sleep with inode lock in lock_and_join_requests fs/nfs/pagelist.c | 59 ++++++++++++++++++++++++++++++------------------ fs/nfs/write.c | 21 +++++++++++++---- include/linux/nfs_page.h | 1 + 3 files changed, 55 insertions(+), 26 deletions(-) -- 1.8.5.2 (Apple Git-48) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html