[folded-merged] ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages-v2.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages-v2
has been removed from the -mm tree.  Its filename was
     ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages-v2.patch

This patch was dropped because it was folded into ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages.patch

------------------------------------------------------
From: jiangyiwen <jiangyiwen@xxxxxxxxxx>
Subject: ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages-v2

Signed-off-by: jiangyiwen <jiangyiwen@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/ocfs2/dlm/dlmthread.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/ocfs2/dlm/dlmthread.c~ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages-v2 fs/ocfs2/dlm/dlmthread.c
--- a/fs/ocfs2/dlm/dlmthread.c~ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages-v2
+++ a/fs/ocfs2/dlm/dlmthread.c
@@ -217,7 +217,7 @@ static void dlm_purge_lockres(struct dlm
 	else {
 		mlog(ML_ERROR, "Resource %.*s not on the Tracking list\n",
 				res->lockname.len, res->lockname.name);
-		dlm_print_one_lock_resource(res);
+		__dlm_print_one_lock_resource(res);
 	}
 	spin_unlock(&dlm->track_lock);
 
_

Patches currently in -mm which might be from jiangyiwen@xxxxxxxxxx are

origin.patch
ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages.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




[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux