Commit:     116ba5d5ea1a5789a8c14b1087014007cada363b
Parent:     ba611edfe406be745be95c332990c8e908c026c3
Author:     Joonwoo Park <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 26 12:09:57 2007 +0900
Committer:  Mark Fasheh <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 15:05:47 2008 -0800

    configfs: file.c fix possible recursive locking
    configfs_register_subsystem() with default_groups triggers recursive 
    it seems that mutex_lock_nested is needed.
    [ INFO: possible recursive locking detected ]
    2.6.24-rc6 #145
    swapper/1 is trying to acquire lock:
     (&sb->s_type->i_mutex_key#3){--..}, at: [<c40c9a9e>] 
    but task is already holding lock:
     (&sb->s_type->i_mutex_key#3){--..}, at: [<c40ca985>] 
    other info that might help us debug this:
    1 lock held by swapper/1:
     #0:  (&sb->s_type->i_mutex_key#3){--..}, at: [<c40ca985>] 
    stack backtrace:
    Pid: 1, comm: swapper Not tainted 2.6.24-rc6 #145
     [<c40053ba>] show_trace_log_lvl+0x1a/0x30
     [<c4005e82>] show_trace+0x12/0x20
     [<c400687e>] dump_stack+0x6e/0x80
     [<c404ec72>] __lock_acquire+0xe62/0x1120
     [<c404efb2>] lock_acquire+0x82/0xa0
     [<c43fda88>] mutex_lock_nested+0x98/0x2e0
     [<c40c9a9e>] configfs_add_file+0x2e/0x70
     [<c40c9b0c>] configfs_create_file+0x2c/0x40
     [<c40ca639>] configfs_attach_item+0x139/0x220
     [<c40ca734>] configfs_attach_group+0x14/0x140
     [<c40ca7e9>] configfs_attach_group+0xc9/0x140
     [<c40ca9f6>] configfs_register_subsystem+0xc6/0x130
     [<c45c8186>] init_netconsole+0x2b6/0x300
     [<c45a75f2>] kernel_init+0x142/0x320
     [<c4004fb3>] kernel_thread_helper+0x7/0x14
    Signed-off-by: Joonwoo Park <[EMAIL PROTECTED]>
    Signed-off-by: Joel Becker <[EMAIL PROTECTED]>
    Signed-off-by: Mark Fasheh <[EMAIL PROTECTED]>
 fs/configfs/file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index a3658f9..397cb50 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -320,7 +320,7 @@ int configfs_add_file(struct dentry * dir, const struct 
configfs_attribute * att
        umode_t mode = (attr->ca_mode & S_IALLUGO) | S_IFREG;
        int error = 0;
-       mutex_lock(&dir->d_inode->i_mutex);
+       mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_NORMAL);
        error = configfs_make_dirent(parent_sd, NULL, (void *) attr, mode, 
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to