The patch titled Subject: ocfs2-add-ocfs2_try_rw_lock-and-ocfs2_try_inode_lock-v2 has been removed from the -mm tree. Its filename was ocfs2-add-ocfs2_try_rw_lock-and-ocfs2_try_inode_lock-v2.patch This patch was dropped because it was folded into ocfs2-add-ocfs2_try_rw_lock-and-ocfs2_try_inode_lock.patch ------------------------------------------------------ From: Gang He <ghe@xxxxxxxx> Subject: ocfs2-add-ocfs2_try_rw_lock-and-ocfs2_try_inode_lock-v2 Link: http://lkml.kernel.org/r/1511944612-9629-2-git-send-email-ghe@xxxxxxxx Signed-off-by: Gang He <ghe@xxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx> Cc: Joseph Qi <jiangqi903@xxxxxxxxx> Cc: Changwei Ge <ge.changwei@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/dlmglue.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN fs/ocfs2/dlmglue.c~ocfs2-add-ocfs2_try_rw_lock-and-ocfs2_try_inode_lock-v2 fs/ocfs2/dlmglue.c --- a/fs/ocfs2/dlmglue.c~ocfs2-add-ocfs2_try_rw_lock-and-ocfs2_try_inode_lock-v2 +++ a/fs/ocfs2/dlmglue.c @@ -1759,8 +1759,7 @@ int ocfs2_try_rw_lock(struct inode *inod level = write ? DLM_LOCK_EX : DLM_LOCK_PR; - status = ocfs2_cluster_lock(OCFS2_SB(inode->i_sb), lockres, level, - DLM_LKF_NOQUEUE, 0); + status = ocfs2_cluster_lock(osb, lockres, level, DLM_LKF_NOQUEUE, 0); return status; } _ Patches currently in -mm which might be from ghe@xxxxxxxx are ocfs2-get-rid-of-ocfs2_is_o2cb_active-function.patch ocfs2-give-an-obvious-tip-for-dismatch-cluster-names.patch ocfs2-move-some-definitions-to-header-file.patch ocfs2-fix-some-small-problems.patch ocfs2-add-kobject-for-online-file-check.patch ocfs2-add-duplicative-ino-number-check.patch ocfs2-add-ocfs2_try_rw_lock-and-ocfs2_try_inode_lock.patch ocfs2-add-ocfs2_overwrite_io-function.patch ocfs2-add-ocfs2_overwrite_io-function-v2.patch ocfs2-nowait-aio-support.patch ocfs2-nowait-aio-support-v2.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html