kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fs/affs: make root lookup from blkdev logical size

Browse source 
This patch resolves https://bugzilla.kernel.org/show_bug.cgi?id=16531.

When logical blkdev size > 512 then sector numbers become larger than the
device can support.

Make affs start lookup based on the device's logical sector size instead
of 512.

Reported-by: Mark <markk@clara.co.uk>
Suggested-by: Mark <markk@clara.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Pranay Kr. Srivastava 2015-09-09 15:39:09 -07:00 committed by Linus Torvalds
parent 9a5bc726d5
commit e852d82a5b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/affs/super.c
View file

@ -18,6 +18,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/writeback.h> #include <linux/writeback.h>
#include <linux/blkdev.h>
#include "affs.h" #include "affs.h"
static int affs_statfs(struct dentry *dentry, struct kstatfs *buf); static int affs_statfs(struct dentry *dentry, struct kstatfs *buf);
@ -352,18 +353,19 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
* blocks, we will have to change it. * blocks, we will have to change it.
*/ */
size = sb->s_bdev->bd_inode->i_size >> 9; size = i_size_read(sb->s_bdev->bd_inode) >> 9;
pr_debug("initial blocksize=%d, #blocks=%d\n", 512, size); pr_debug("initial blocksize=%d, #blocks=%d\n", 512, size);
affs_set_blocksize(sb, PAGE_SIZE); affs_set_blocksize(sb, PAGE_SIZE);
/* Try to find root block. Its location depends on the block size. */ /* Try to find root block. Its location depends on the block size. */
i = 512; i = bdev_logical_block_size(sb->s_bdev);
j = 4096; j = PAGE_SIZE;
if (blocksize > 0) { if (blocksize > 0) {
i = j = blocksize; i = j = blocksize;
size = size / (blocksize / 512); size = size / (blocksize / 512);
} }
for (blocksize = i; blocksize <= j; blocksize <<= 1, size >>= 1) { for (blocksize = i; blocksize <= j; blocksize <<= 1, size >>= 1) {
sbi->s_root_block = root_block; sbi->s_root_block = root_block;
if (root_block < 0) if (root_block < 0)