Skip to content

Commit f598f82

Browse files
Coly Litorvalds
authored andcommitted
romfs: use different way to generate fsid for BLOCK or MTD
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/[email protected] Signed-off-by: Coly Li <[email protected]> Reported-by: Nong Li <[email protected]> Tested-by: Nong Li <[email protected]> Cc: Richard Weinberger <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 4180c4c commit f598f82

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

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

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

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

0 commit comments

Comments
 (0)