Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d683a09 authored by Roberto Sassu's avatar Roberto Sassu Committed by Al Viro
Browse files

wrong type for 'magic' argument in simple_fill_super() 



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

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@polito.it>
Reviewed-by: default avatarMimi Zohar <zohar@us.ibm.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
CC: stable@kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 971b2e8a

fs/libfs.c

+2 −1
Original line number Diff line number Diff line
@@ -489,7 +489,8 @@ int simple_write_end(struct file *file, struct address_space *mapping, 
 * unique inode values later for this filesystem, then you must take care

 * to pass it an appropriate max_reserved value to avoid collisions.

 */

int simple_fill_super(struct super_block *s, int magic, struct tree_descr *files)

int simple_fill_super(struct super_block *s, unsigned long magic,

		      struct tree_descr *files)

{

	struct inode *inode;

	struct dentry *root;

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2388,7 +2388,7 @@ extern const struct file_operations simple_dir_operations; 
extern const struct inode_operations simple_dir_inode_operations;

struct tree_descr { char *name; const struct file_operations *ops; int mode; };

struct dentry *d_alloc_name(struct dentry *, const char *);

extern int simple_fill_super(struct super_block *, int, struct tree_descr *);

extern int simple_fill_super(struct super_block *, unsigned long, struct tree_descr *);

extern int simple_pin_fs(struct file_system_type *, struct vfsmount **mount, int *count);

extern void simple_release_fs(struct vfsmount **mount, int *count);