Skip to content

Commit 2027766

Browse files
Coly Ligregkh
authored andcommitted
romfs: use different way to generate fsid for BLOCK or MTD
[ Upstream commit f598f82e204ec0b17797caaf1b0311c52d43fb9a ] Commit 8a59f5d ("fs/romfs: return f_fsid for statfs(2)") generates a 64bit id from sb->s_bdev->bd_dev. This is only correct when romfs is defined with CONFIG_ROMFS_ON_BLOCK. If romfs is only defined with CONFIG_ROMFS_ON_MTD, sb->s_bdev is NULL, referencing sb->s_bdev->bd_dev will triger an oops. Richard Weinberger points out that when CONFIG_ROMFS_BACKED_BY_BOTH=y, both CONFIG_ROMFS_ON_BLOCK and CONFIG_ROMFS_ON_MTD are defined. Therefore when calling huge_encode_dev() to generate a 64bit id, I use the follow order to choose parameter, - CONFIG_ROMFS_ON_BLOCK defined use sb->s_bdev->bd_dev - CONFIG_ROMFS_ON_BLOCK undefined and CONFIG_ROMFS_ON_MTD defined use sb->s_dev when, - both CONFIG_ROMFS_ON_BLOCK and CONFIG_ROMFS_ON_MTD undefined leave id as 0 When CONFIG_ROMFS_ON_MTD is defined and sb->s_mtd is not NULL, sb->s_dev is set to a device ID generated by MTD_BLOCK_MAJOR and mtd index, otherwise sb->s_dev is 0. This is a try-best effort to generate a uniq file system ID, if all the above conditions are not meet, f_fsid of this romfs instance will be 0. Generally only one romfs can be built on single MTD block device, this method is enough to identify multiple romfs instances in a computer. Link: http://lkml.kernel.org/r/1482928596-115155-1-git-send-email-colyli@suse.de Signed-off-by: Coly Li <colyli@suse.de> Reported-by: Nong Li <nongli1031@gmail.com> Tested-by: Nong Li <nongli1031@gmail.com> Cc: Richard Weinberger <richard.weinberger@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 50ef0e2 commit 2027766

1 file changed

Lines changed: 22 additions & 1 deletion

File tree

fs/romfs/super.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
#include <linux/highmem.h>
7575
#include <linux/pagemap.h>
7676
#include <linux/uaccess.h>
77+
#include <linux/major.h>
7778
#include "internal.h"
7879

7980
static struct kmem_cache *romfs_inode_cachep;
@@ -415,7 +416,22 @@ static void romfs_destroy_inode(struct inode *inode)
415416
static int romfs_statfs(struct dentry *dentry, struct kstatfs *buf)
416417
{
417418
struct super_block *sb = dentry->d_sb;
418-
u64 id = huge_encode_dev(sb->s_bdev->bd_dev);
419+
u64 id = 0;
420+
421+
/* When calling huge_encode_dev(),
422+
* use sb->s_bdev->bd_dev when,
423+
* - CONFIG_ROMFS_ON_BLOCK defined
424+
* use sb->s_dev when,
425+
* - CONFIG_ROMFS_ON_BLOCK undefined and
426+
* - CONFIG_ROMFS_ON_MTD defined
427+
* leave id as 0 when,
428+
* - CONFIG_ROMFS_ON_BLOCK undefined and
429+
* - CONFIG_ROMFS_ON_MTD undefined
430+
*/
431+
if (sb->s_bdev)
432+
id = huge_encode_dev(sb->s_bdev->bd_dev);
433+
else if (sb->s_dev)
434+
id = huge_encode_dev(sb->s_dev);
419435

420436
buf->f_type = ROMFS_MAGIC;
421437
buf->f_namelen = ROMFS_MAXFN;
@@ -488,6 +504,11 @@ static int romfs_fill_super(struct super_block *sb, void *data, int silent)
488504
sb->s_flags |= MS_RDONLY | MS_NOATIME;
489505
sb->s_op = &romfs_super_ops;
490506

507+
#ifdef CONFIG_ROMFS_ON_MTD
508+
/* Use same dev ID from the underlying mtdblock device */
509+
if (sb->s_mtd)
510+
sb->s_dev = MKDEV(MTD_BLOCK_MAJOR, sb->s_mtd->index);
511+
#endif
491512
/* read the image superblock and check it */
492513
rsb = kmalloc(512, GFP_KERNEL);
493514
if (!rsb)

0 commit comments

Comments
 (0)