diff mbox

[RFC,-V3,9/9] ext4: Fix lockdep recursive locking warning

Message ID 1225997374-10846-9-git-send-email-aneesh.kumar@linux.vnet.ibm.com
State Superseded, archived
Headers show

Commit Message

Aneesh Kumar K.V Nov. 6, 2008, 6:49 p.m. UTC 
Indicate that the group locks can be taken in loop.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 fs/ext4/mballoc.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

Comments

Li Zefan Nov. 7, 2008, 8:04 a.m. UTC | #1 
I got compile error on IA64:

fs/ext4/mballoc.c: In function ‘ext4_mb_add_groupinfo’:
fs/ext4/mballoc.c:2482: error: implicit declaration of function ‘__init_rwsem’


Aneesh Kumar K.V wrote:
> Indicate that the group locks can be taken in loop.
> 
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
> ---
>  fs/ext4/mballoc.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> index f58de20..34b9b7c 100644
> --- a/fs/ext4/mballoc.c
> +++ b/fs/ext4/mballoc.c
> @@ -2413,6 +2413,7 @@ ext4_mb_store_history(struct ext4_allocation_context *ac)
>  #define ext4_mb_history_init(sb)
>  #endif
>  
> +static struct lock_class_key alloc_sem_key[NR_BG_LOCKS];
>  
>  /* Create and initialize ext4_group_info data for the given group. */
>  int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,
> @@ -2473,7 +2474,9 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,
>  	}
>  
>  	INIT_LIST_HEAD(&meta_group_info[i]->bb_prealloc_list);
> -	init_rwsem(&meta_group_info[i]->alloc_sem);
> +	__init_rwsem(&meta_group_info[i]->alloc_sem,
> +			"&meta_group_info[i]->alloc_sem",
> +			&alloc_sem_key[i]);
>  	meta_group_info[i]->bb_free_root.rb_node = NULL;;
>  
>  #ifdef DOUBLE_CHECK
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index f58de20..34b9b7c 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2413,6 +2413,7 @@  ext4_mb_store_history(struct ext4_allocation_context *ac)
 #define ext4_mb_history_init(sb)
 #endif
 
+static struct lock_class_key alloc_sem_key[NR_BG_LOCKS];
 
 /* Create and initialize ext4_group_info data for the given group. */
 int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,
@@ -2473,7 +2474,9 @@  int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,
 	}
 
 	INIT_LIST_HEAD(&meta_group_info[i]->bb_prealloc_list);
-	init_rwsem(&meta_group_info[i]->alloc_sem);
+	__init_rwsem(&meta_group_info[i]->alloc_sem,
+			"&meta_group_info[i]->alloc_sem",
+			&alloc_sem_key[i]);
 	meta_group_info[i]->bb_free_root.rb_node = NULL;;
 
 #ifdef DOUBLE_CHECK