| From 7d683a09990ff095a91b6e724ecee0ff8733274a Mon Sep 17 00:00:00 2001 |
| From: Roberto Sassu <roberto.sassu@polito.it> |
| Date: Thu, 3 Jun 2010 11:58:28 +0200 |
| Subject: wrong type for 'magic' argument in simple_fill_super() |
| |
| From: Roberto Sassu <roberto.sassu@polito.it> |
| |
| commit 7d683a09990ff095a91b6e724ecee0ff8733274a upstream. |
| |
| 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> |
| Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| fs/libfs.c | 3 ++- |
| include/linux/fs.h | 2 +- |
| 2 files changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/fs/libfs.c |
| +++ b/fs/libfs.c |
| @@ -415,7 +415,8 @@ int simple_write_end(struct file *file, |
| * 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; |
| --- a/include/linux/fs.h |
| +++ b/include/linux/fs.h |
| @@ -2376,7 +2376,7 @@ extern const struct file_operations simp |
| 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); |
| |
