From fe1a2e8632b69179dccb50383e085052c75d8027 Mon Sep 17 00:00:00 2001 From: Roberto Sassu Date: Thu, 3 Jun 2010 11:58:28 +0200 Subject: [PATCH] --- yaml --- r: 200132 b: refs/heads/master c: 7d683a09990ff095a91b6e724ecee0ff8733274a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/libfs.c | 3 ++- trunk/include/linux/fs.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 911dd7bb51ba..6145e700cf8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 971b2e8a3f5dc0cbef19ec1a77b6d20237aa751e +refs/heads/master: 7d683a09990ff095a91b6e724ecee0ff8733274a diff --git a/trunk/fs/libfs.c b/trunk/fs/libfs.c index 09e1016eb774..dcaf972cbf1b 100644 --- a/trunk/fs/libfs.c +++ b/trunk/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; diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 3428393942a6..471e1ff5079a 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -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);