diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:48:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:48:03 -0700 |
| commit | 0f1bce41fed02e45f31c2409f29e69e1fedebcdc (patch) | |
| tree | 21cde215291e59ccc5e10fadd74fbfc6206832ae /fs/udf/partition.c | |
| parent | da1ba891f22835db9a2c349315c3763e9f4e4e67 (diff) | |
| parent | 9afadc4b1fd25337003832c9a4668f9bd42cdda9 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: Fix memory corruption when fs mounted with noadinicb option
udf: Make udf exportable
udf: fs/udf/partition.c:udf_get_pblock() mustn't be inline
Diffstat (limited to 'fs/udf/partition.c')
| -rw-r--r-- | fs/udf/partition.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/partition.c b/fs/udf/partition.c index 63610f026ae1..96dfd207c3d6 100644 --- a/fs/udf/partition.c +++ b/fs/udf/partition.c @@ -27,8 +27,8 @@ #include <linux/slab.h> #include <linux/buffer_head.h> -inline uint32_t udf_get_pblock(struct super_block *sb, uint32_t block, - uint16_t partition, uint32_t offset) +uint32_t udf_get_pblock(struct super_block *sb, uint32_t block, + uint16_t partition, uint32_t offset) { struct udf_sb_info *sbi = UDF_SB(sb); struct udf_part_map *map; |