[PATCH] Locking problems while EXT3FS_DEBUG on

I noticed some problems while running ext3 with the debug flag set on.
More precisely, I was unable to umount the filesystem.  Some investigation
took me to the patch that follows.

At a first glance , the lock/unlock I've taken out seems really not
necessary, as the main code (outside debug) does not lock the super.  The
only additional danger operations that debug code introduces seems to be
related to bitmap, but bitmap operations tends to be all atomic anyway.

I also took the opportunity to fix 2 spelling errors.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 0213db4911a2..032c7ba1b13f 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -1010,7 +1010,7 @@ retry:
  * allocation within the reservation window.
  *
  * This will avoid keeping on searching the reservation list again and
- * again when someboday is looking for a free block (without
+ * again when somebody is looking for a free block (without
  * reservation), and there are lots of free blocks, but they are all
  * being reserved.
  *
@@ -1416,12 +1416,12 @@ unsigned long ext3_count_free_blocks(struct super_block *sb)
         unsigned long bitmap_count, x;
         struct buffer_head *bitmap_bh = NULL;
 
-        lock_super(sb);
         es = EXT3_SB(sb)->s_es;
         desc_count = 0;
         bitmap_count = 0;
         gdp = NULL;
 
+        smp_rmb();
         for (i = 0; i < ngroups; i++) {
                 gdp = ext3_get_group_desc(sb, i, NULL);
                 if (!gdp)
@@ -1440,7 +1440,6 @@ unsigned long ext3_count_free_blocks(struct super_block *sb)
         brelse(bitmap_bh);
         printk("ext3_count_free_blocks: stored = %u, computed = %lu, %lu\n",
                le32_to_cpu(es->s_free_blocks_count), desc_count, bitmap_count);
-        unlock_super(sb);
         return bitmap_count;
 #else
         desc_count = 0;