diff for duplicates of <20080609125443.GL18153@localhost> diff --git a/a/1.txt b/N1/1.txt index d980b48..aa7f84c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -176,7 +176,7 @@ On Mon, Jun 09, 2008 at 01:03:53PM +0200, Louis Rilling wrote: > http://www.kerlabs.com/ 35700 Rennes > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -> the body of a message to majordomo at vger.kernel.org +> the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ @@ -185,10 +185,3 @@ Dr Louis Rilling Kerlabs Skype: louis.rilling Batiment Germanium Phone: (+33|0) 6 80 89 08 23 80 avenue des Buttes de Coesmes http://www.kerlabs.com/ 35700 Rennes --------------- next part -------------- -A non-text attachment was scrubbed... -Name: show-configfs-deadlock-with-rename.patch -Type: text/x-diff -Size: 784 bytes -Desc: not available -Url : http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20080609/c16caf4e/attachment.bin diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..0b147c2 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,3 @@ +Content-Type: text/x-diff; charset=us-ascii +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; filename="show-configfs-deadlock-with-rename.patch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..f799598 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,28 @@ +--- + fs/namei.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +Index: b/fs/namei.c +=================================================================== +--- a/fs/namei.c 2008-06-09 13:33:25.000000000 +0200 ++++ b/fs/namei.c 2008-06-09 13:35:57.000000000 +0200 +@@ -31,6 +31,7 @@ + #include <linux/file.h> + #include <linux/fcntl.h> + #include <linux/device_cgroup.h> ++#include <linux/jiffies.h> + #include <asm/namei.h> + #include <asm/uaccess.h> + +@@ -1566,6 +1567,11 @@ struct dentry *lock_rename(struct dentry + } + + mutex_lock_nested(&p1->d_inode->i_mutex, I_MUTEX_PARENT); ++ if (!strcmp(current->comm, "test_deadlock")) { ++ unsigned long now = jiffies; ++ while (jiffies - now < 8 * HZ) ++ cpu_relax(); ++ } + mutex_lock_nested(&p2->d_inode->i_mutex, I_MUTEX_CHILD); + return NULL; + } diff --git a/a/content_digest b/N1/content_digest index dfa9f80..f2177fa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,12 +6,12 @@ "ref\020080606230154.GK29740@mail.oracle.com\0" "ref\020080609110353.GK18153@localhost\0" "From\0Louis Rilling <Louis.Rilling@kerlabs.com>\0" - "Subject\0[Ocfs2-devel] [BUG] deadlock between configfs_rmdir() and sys_rename() (WAS Re:\t[RFC][PATCH 4/4] configfs: Make multiple default_group)\tdestructions lockdep friendly\0" + "Subject\0[BUG] deadlock between configfs_rmdir() and sys_rename() (WAS Re: [RFC][PATCH 4/4] configfs: Make multiple default_group) destructions lockdep friendly\0" "Date\0Mon, 9 Jun 2008 14:54:43 +0200\0" "To\0Joel.Becker@oracle.com\0" "Cc\0ocfs2-devel@oss.oracle.com" " linux-kernel@vger.kernel.org\0" - "\00:1\0" + "\01:1\0" "b\0" "Hi,\n" "\n" @@ -191,7 +191,7 @@ "> http://www.kerlabs.com/\t\t\t35700 Rennes\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-kernel\" in\n" - "> the body of a message to majordomo at vger.kernel.org\n" + "> the body of a message to majordomo@vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "> Please read the FAQ at http://www.tux.org/lkml/\n" "\n" @@ -199,13 +199,37 @@ "Dr Louis Rilling\t\t\tKerlabs\n" "Skype: louis.rilling\t\t\tBatiment Germanium\n" "Phone: (+33|0) 6 80 89 08 23\t\t80 avenue des Buttes de Coesmes\n" - "http://www.kerlabs.com/\t\t\t35700 Rennes\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: show-configfs-deadlock-with-rename.patch\n" - "Type: text/x-diff\n" - "Size: 784 bytes\n" - "Desc: not available\n" - Url : http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20080609/c16caf4e/attachment.bin + "http://www.kerlabs.com/\t\t\t35700 Rennes" + "\01:2\0" + "fn\0show-configfs-deadlock-with-rename.patch\0" + "b\0" + "---\n" + " fs/namei.c | 6 ++++++\n" + " 1 file changed, 6 insertions(+)\n" + "\n" + "Index: b/fs/namei.c\n" + "===================================================================\n" + "--- a/fs/namei.c\t2008-06-09 13:33:25.000000000 +0200\n" + "+++ b/fs/namei.c\t2008-06-09 13:35:57.000000000 +0200\n" + "@@ -31,6 +31,7 @@\n" + " #include <linux/file.h>\n" + " #include <linux/fcntl.h>\n" + " #include <linux/device_cgroup.h>\n" + "+#include <linux/jiffies.h>\n" + " #include <asm/namei.h>\n" + " #include <asm/uaccess.h>\n" + " \n" + "@@ -1566,6 +1567,11 @@ struct dentry *lock_rename(struct dentry\n" + " \t}\n" + " \n" + " \tmutex_lock_nested(&p1->d_inode->i_mutex, I_MUTEX_PARENT);\n" + "+\tif (!strcmp(current->comm, \"test_deadlock\")) {\n" + "+\t\tunsigned long now = jiffies;\n" + "+\t\twhile (jiffies - now < 8 * HZ)\n" + "+\t\t\tcpu_relax();\n" + "+\t}\n" + " \tmutex_lock_nested(&p2->d_inode->i_mutex, I_MUTEX_CHILD);\n" + " \treturn NULL;\n" + } -d9269ee8e1dd36f0c6c6c6f0b0b7ec2ff0d9af9a71eeb70a8ceab782fd2d7e6c +135bafc446f996bfb17af8c5ce1ba24305ecc48a2d14933a43af0445ef36189f
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.