diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /include/linux/ext3_fs_sb.h | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'include/linux/ext3_fs_sb.h')
| -rw-r--r-- | include/linux/ext3_fs_sb.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ext3_fs_sb.h b/include/linux/ext3_fs_sb.h index b65f0288b842..e024e38248ff 100644 --- a/include/linux/ext3_fs_sb.h +++ b/include/linux/ext3_fs_sb.h | |||
| @@ -83,4 +83,10 @@ struct ext3_sb_info { | |||
| 83 | #endif | 83 | #endif |
| 84 | }; | 84 | }; |
| 85 | 85 | ||
| 86 | static inline spinlock_t * | ||
| 87 | sb_bgl_lock(struct ext3_sb_info *sbi, unsigned int block_group) | ||
| 88 | { | ||
| 89 | return bgl_lock_ptr(&sbi->s_blockgroup_lock, block_group); | ||
| 90 | } | ||
| 91 | |||
| 86 | #endif /* _LINUX_EXT3_FS_SB */ | 92 | #endif /* _LINUX_EXT3_FS_SB */ |