Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / include / linux / ext3_fs_sb.h

diff --git a/include/linux/ext3_fs_sb.h b/include/linux/ext3_fs_sb.h
index a4e9216b3a6dd7894d53b6b1636acb360973861b..f07f34de2f0ecb7ed987c49c604ce3efce4690e6 100644 (file)
--- a/include/linux/ext3_fs_sb.h
+++ b/include/linux/ext3_fs_sb.h
@@ -61,7 +61,7 @@ struct ext3_sb_info {
        struct percpu_counter s_freeblocks_counter;
        struct percpu_counter s_freeinodes_counter;
        struct percpu_counter s_dirs_counter;
-       struct blockgroup_lock s_blockgroup_lock;
+       struct blockgroup_lock *s_blockgroup_lock;
 
        /* root of the per fs reservation window tree */
        spinlock_t s_rsv_window_lock;
@@ -87,7 +87,7 @@ struct ext3_sb_info {
 static inline spinlock_t *
 sb_bgl_lock(struct ext3_sb_info *sbi, unsigned int block_group)
 {
-       return bgl_lock_ptr(&sbi->s_blockgroup_lock, block_group);
+       return bgl_lock_ptr(sbi->s_blockgroup_lock, block_group);
 }
 
 #endif /* _LINUX_EXT3_FS_SB */