Commit c644f0e4 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

fs: introduce bgl_lock_ptr() 



As suggested by Andreas Dilger, introduce a bgl_lock_ptr() helper in
<linux/blockgroup_lock.h> and add separate sb_bgl_lock() helpers to
filesystem specific header files to break the hidden dependency to
struct ext[234]_sb_info.

Also, while at it, convert the macros to static inlines to try make up
for all the times I broke Andrew Morton's tree.

Acked-by: default avatarAndreas Dilger <adilger@sun.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0a30c5ce

fs/ext4/ext4_sb.h

+6 −0
Original line number Diff line number Diff line
@@ -146,4 +146,10 @@ struct ext4_sb_info { 
	struct flex_groups *s_flex_groups;

};



static inline spinlock_t *

sb_bgl_lock(struct ext4_sb_info *sbi, unsigned int block_group)

{

	return bgl_lock_ptr(&sbi->s_blockgroup_lock, block_group);

}



#endif	/* _EXT4_SB */

include/linux/blockgroup_lock.h

+5 −2
Original line number Diff line number Diff line
@@ -53,7 +53,10 @@ static inline void bgl_lock_init(struct blockgroup_lock *bgl) 
 * The accessor is a macro so we can embed a blockgroup_lock into different

 * superblock types

 */

#define sb_bgl_lock(sb, block_group) \

	(&(sb)->s_blockgroup_lock.locks[(block_group) & (NR_BG_LOCKS-1)].lock)

static inline spinlock_t *

bgl_lock_ptr(struct blockgroup_lock *bgl, unsigned int block_group)

{

	return &bgl->locks[(block_group) & (NR_BG_LOCKS-1)].lock;

}



#endif

include/linux/ext2_fs_sb.h

+6 −0
Original line number Diff line number Diff line
@@ -108,4 +108,10 @@ struct ext2_sb_info { 
	struct ext2_reserve_window_node s_rsv_window_head;

};



static inline spinlock_t *

sb_bgl_lock(struct ext2_sb_info *sbi, unsigned int block_group)

{

	return bgl_lock_ptr(&sbi->s_blockgroup_lock, block_group);

}



#endif	/* _LINUX_EXT2_FS_SB */

include/linux/ext3_fs_sb.h

+6 −0
Original line number Diff line number Diff line
@@ -83,4 +83,10 @@ struct ext3_sb_info { 
#endif

};



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);

}



#endif	/* _LINUX_EXT3_FS_SB */

CRA Git | Maintained and supported by SUSTech CRA and CCSE