Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7d683a09990ff095a91b6e724ecee0ff8733274a

Authored by Roberto Sassu
Committed by Al Viro
1 parent 971b2e8a3f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

wrong type for 'magic' argument in simple_fill_super() 

It's used to superblock ->s_magic, which is unsigned long.

Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Reviewed-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
CC: stable@kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

... ... @@ -489,7 +489,8 @@
489 489 * unique inode values later for this filesystem, then you must take care
490 490 * to pass it an appropriate max_reserved value to avoid collisions.
491 491 */
492   -int simple_fill_super(struct super_block *s, int magic, struct tree_descr *files)
  492 +int simple_fill_super(struct super_block *s, unsigned long magic,
  493 + struct tree_descr *files)
493 494 {
494 495 struct inode *inode;
495 496 struct dentry *root;
... ... @@ -2388,7 +2388,7 @@
2388 2388 extern const struct inode_operations simple_dir_inode_operations;
2389 2389 struct tree_descr { char *name; const struct file_operations *ops; int mode; };
2390 2390 struct dentry *d_alloc_name(struct dentry *, const char *);
2391   -extern int simple_fill_super(struct super_block *, int, struct tree_descr *);
  2391 +extern int simple_fill_super(struct super_block *, unsigned long, struct tree_descr *);
2392 2392 extern int simple_pin_fs(struct file_system_type *, struct vfsmount **mount, int *count);
2393 2393 extern void simple_release_fs(struct vfsmount **mount, int *count);
2394 2394