summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@polito.it>2010-06-03 11:58:28 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-05 11:16:06 -0700
commit10b2ad8fecd1936e30fda32d1adcb787da3410dd (patch)
treef2e9880e8cc3dcd1ea81a93a1201362af973a1a7 /fs
parent0723ebb25fe048d3e6bcea6fd565837d7f0a3b4d (diff)
downloadlwn-10b2ad8fecd1936e30fda32d1adcb787da3410dd.tar.gz
lwn-10b2ad8fecd1936e30fda32d1adcb787da3410dd.zip
wrong type for 'magic' argument in simple_fill_super()
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/libfs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/libfs.c b/fs/libfs.c
index 6e8d17e1dc4c..9e0fc76ad21f 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -415,7 +415,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;