diff for duplicates of <5278C1D9.9030101@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index b1a5e39..89cf4c1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ reworked locking to fix related lock ordering on takeover, and introduced consol into fbmem, but it seems that the new lock sequence(fb_info->lock ---> console_lock) is against with the one in console_callback(console_lock ---> fb_info->lock), and leads to a potential dead lock as following: -[ 601.079000] =========================== +[ 601.079000] ====================================================== [ 601.079000] [ INFO: possible circular locking dependency detected ] [ 601.079000] 3.11.0 #189 Not tainted [ 601.079000] ------------------------------------------------------- @@ -117,7 +117,7 @@ index dacaf74..010d191 100644 - console_unlock(); unlock_fb_info(info); + console_unlock(); - if (ret = 0 && copy_to_user(argp, &var, sizeof(var))) + if (ret == 0 && copy_to_user(argp, &var, sizeof(var))) return -EFAULT; break; @@ -1184,23 +1188,27 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, diff --git a/a/content_digest b/N1/content_digest index ccfc5a4..a23ff16 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Gu Zheng <guz.fnst@cn.fujitsu.com>\0" "Subject\0[RESEND PATCH 1/2] fb: reorder the lock sequence to fix potential dead lock\0" - "Date\0Tue, 05 Nov 2013 10:00:57 +0000\0" + "Date\0Tue, 05 Nov 2013 18:00:57 +0800\0" "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>" " Tomi Valkeinen <tomi.valkeinen@ti.com>\0" "Cc\0Linux Fbdev development list <linux-fbdev@vger.kernel.org>" @@ -15,7 +15,7 @@ "into fbmem, but it seems that the new lock sequence(fb_info->lock ---> console_lock)\n" "is against with the one in console_callback(console_lock ---> fb_info->lock), and leads to\n" "a potential dead lock as following:\n" - "[ 601.079000] ===========================\n" + "[ 601.079000] ======================================================\n" "[ 601.079000] [ INFO: possible circular locking dependency detected ]\n" "[ 601.079000] 3.11.0 #189 Not tainted\n" "[ 601.079000] -------------------------------------------------------\n" @@ -126,7 +126,7 @@ "-\t\tconsole_unlock();\n" " \t\tunlock_fb_info(info);\n" "+\t\tconsole_unlock();\n" - " \t\tif (ret = 0 && copy_to_user(argp, &var, sizeof(var)))\n" + " \t\tif (ret == 0 && copy_to_user(argp, &var, sizeof(var)))\n" " \t\t\treturn -EFAULT;\n" " \t\tbreak;\n" "@@ -1184,23 +1188,27 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,\n" @@ -293,4 +293,4 @@ "-- \n" 1.7.7 -97707f6af11edf5b40a4805bfa896b1a014ae863ed6ae5a56fd397a7f78b18e4 +75c50bacac68e8f5426e5e9938f663f4c2dd5f6e2da870262c748d7f0abf3b03
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.