diff options
| author | Jason Jin <Jason.Jin@freescale.com> | 2015-03-19 05:40:14 (GMT) |
|---|---|---|
| committer | Jason Jin <Jason.Jin@freescale.com> | 2015-03-19 05:40:14 (GMT) |
| commit | b2d58e506b33b18574807e63007e87ebca0f9c07 (patch) | |
| tree | fc2afd772ba5cdac0dd091f65c492695b27d9a17 /fs/minix | |
| parent | 2bbe09ef71ce8446ba0b3e29df2099150e9e6fdf (diff) | |
| parent | eb985cb9b5e02d470870617b41fa51a1d9360c7f (diff) | |
| download | linux-fsl-qoriq-b2d58e506b33b18574807e63007e87ebca0f9c07.tar.xz | |
Merge branch 'qoriq-sdk' into LS1-SDK
Diffstat (limited to 'fs/minix')
| -rw-r--r-- | fs/minix/bitmap.c | 2 | ||||
| -rw-r--r-- | fs/minix/inode.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c index 4bc50da..742942a 100644 --- a/fs/minix/bitmap.c +++ b/fs/minix/bitmap.c @@ -96,7 +96,7 @@ int minix_new_block(struct inode * inode) unsigned long minix_count_free_blocks(struct super_block *sb) { struct minix_sb_info *sbi = minix_sb(sb); - u32 bits = sbi->s_nzones - (sbi->s_firstdatazone + 1); + u32 bits = sbi->s_nzones - sbi->s_firstdatazone + 1; return (count_free(sbi->s_zmap, sb->s_blocksize, bits) << sbi->s_log_zone_size); diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 0332109..a2e7175 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -266,12 +266,12 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) block = minix_blocks_needed(sbi->s_ninodes, s->s_blocksize); if (sbi->s_imap_blocks < block) { printk("MINIX-fs: file system does not have enough " - "imap blocks allocated. Refusing to mount\n"); + "imap blocks allocated. Refusing to mount.\n"); goto out_no_bitmap; } block = minix_blocks_needed( - (sbi->s_nzones - (sbi->s_firstdatazone + 1)), + (sbi->s_nzones - sbi->s_firstdatazone + 1), s->s_blocksize); if (sbi->s_zmap_blocks < block) { printk("MINIX-fs: file system does not have enough " |