diff mbox

[Bug,12672] lockdep warning when using ext4 on x86_64

Message ID 20090209083251.EFCAA108041@picon.linux-foundation.org
State Superseded, archived
Headers show

Commit Message

bugme-daemon@bugzilla.kernel.org Feb. 9, 2009, 8:32 a.m. UTC 
http://bugzilla.kernel.org/show_bug.cgi?id=12672





------- Comment #1 from aneesh.kumar@linux.vnet.ibm.com  2009-02-09 00:32 -------

Can  you try this patch 

        if (ac->ac_buddy_page)
diff mbox

Patch

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index deba54f..34f3a66 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -4476,23 +4476,26 @@  static int ext4_mb_release_context(struct
ext4_allocation_context *ac)
                        pa->pa_free -= ac->ac_b_ex.fe_len;
                        pa->pa_len -= ac->ac_b_ex.fe_len;
                        spin_unlock(&pa->pa_lock);
-                       /*
-                        * We want to add the pa to the right bucket.
-                        * Remove it from the list and while adding
-                        * make sure the list to which we are adding
-                        * doesn't grow big.
-                        */
-                       if (likely(pa->pa_free)) {
-                               spin_lock(pa->pa_obj_lock);
-                               list_del_rcu(&pa->pa_inode_list);
-                               spin_unlock(pa->pa_obj_lock);
-                               ext4_mb_add_n_trim(ac);
-                       }
                }
-               ext4_mb_put_pa(ac, ac->ac_sb, pa);
        }
        if (ac->alloc_semp)
                up_read(ac->alloc_semp);
+       if (pa) {
+               /**
+                * We want to add the pa to the right bucket.
+                * Remove it from the list and while adding
+                * make sure the list to which we are adding
+                * doesn't grow big.
+                */
+               if (likely(pa->pa_free)) {
+                       spin_lock(pa->pa_obj_lock);
+                       list_del_rcu(&pa->pa_inode_list);
+                       spin_unlock(pa->pa_obj_lock);
+                       ext4_mb_add_n_trim(ac);
+               }
+               ext4_mb_put_pa(ac, ac->ac_sb, pa);
+       }
+
        if (ac->ac_bitmap_page)
                page_cache_release(ac->ac_bitmap_page);