summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@polito.it>2010-06-03 11:58:28 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2010-06-04 17:16:28 -0400
commit7d683a09990ff095a91b6e724ecee0ff8733274a (patch)
tree81269fde9fb4d3958fea616269425dd61769aeec /fs
parent971b2e8a3f5dc0cbef19ec1a77b6d20237aa751e (diff)
downloadlinux-3.10-7d683a09990ff095a91b6e724ecee0ff8733274a.tar.gz
linux-3.10-7d683a09990ff095a91b6e724ecee0ff8733274a.tar.bz2
linux-3.10-7d683a09990ff095a91b6e724ecee0ff8733274a.zip
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>
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 09e1016eb77..dcaf972cbf1 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -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;