diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 16:48:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 16:48:37 -0700 |
| commit | 044595d4e448305fbaec472eb7d22636d24e7d8c (patch) | |
| tree | 5faee830194d778a9bb63317bc6ff7f8962a976b /fs/squashfs/super.c | |
| parent | 1583171492eb514e267c7b51e96846b38de0f544 (diff) | |
| parent | 7657cacf478940b995c2c73fdff981c13cc62c5c (diff) | |
| download | linux-044595d4e448305fbaec472eb7d22636d24e7d8c.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
Squashfs: Add an option to set dev block size to 4K
Diffstat (limited to 'fs/squashfs/super.c')
| -rw-r--r-- | fs/squashfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c index 7438850c62d0..2da1715452ac 100644 --- a/fs/squashfs/super.c +++ b/fs/squashfs/super.c @@ -95,7 +95,7 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent) } msblk = sb->s_fs_info; - msblk->devblksize = sb_min_blocksize(sb, BLOCK_SIZE); + msblk->devblksize = sb_min_blocksize(sb, SQUASHFS_DEVBLK_SIZE); msblk->devblksize_log2 = ffz(~msblk->devblksize); mutex_init(&msblk->read_data_mutex); |