diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 12:32:13 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 12:32:13 +0200 |
| commit | 9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee (patch) | |
| tree | 651f7058bbaa2d8b2855286380d614afcf505118 /fs/omfs/bitmap.c | |
| parent | [JFFS2] Move JFFS2 config options out of fs/Kconfig (diff) | |
| parent | Resource handling: add 'insert_resource_expand_to_fit()' function (diff) | |
| download | linux-9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee.tar.xz linux-9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/omfs/bitmap.c')
| -rw-r--r-- | fs/omfs/bitmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/omfs/bitmap.c b/fs/omfs/bitmap.c index 697663b01bae..e1c0ec0ae989 100644 --- a/fs/omfs/bitmap.c +++ b/fs/omfs/bitmap.c @@ -92,7 +92,7 @@ int omfs_allocate_block(struct super_block *sb, u64 block) struct buffer_head *bh; struct omfs_sb_info *sbi = OMFS_SB(sb); int bits_per_entry = 8 * sb->s_blocksize; - int map, bit; + unsigned int map, bit; int ret = 0; u64 tmp; @@ -176,7 +176,8 @@ int omfs_clear_range(struct super_block *sb, u64 block, int count) struct omfs_sb_info *sbi = OMFS_SB(sb); int bits_per_entry = 8 * sb->s_blocksize; u64 tmp; - int map, bit, ret; + unsigned int map, bit; + int ret; tmp = block; bit = do_div(tmp, bits_per_entry); |