diff options
| author | Mursalin Akon <makon@nvidia.com> | 2011-09-14 13:50:31 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:27 -0800 |
| commit | c32dd9b65ccf0062d3fea7780764249721f2d23e (patch) | |
| tree | e5956a44168c6d9261dfe4a877a128dd019f6782 /fs | |
| parent | 77ab961c1b2dbe1f3679d88390e38a99c3d13f53 (diff) | |
fs: fix compilation error for yaffs2
The update is based on 2.6.36 code line. It fixes compilation error.
Bug 877219
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Change-Id: Ic889bd9a62135dc19531c0b33f13cb4eafaa9104
Reviewed-on: http://git-master/r/52464
Reviewed-by: Allen Martin <amartin@nvidia.com>
Rebase-Id: Rdf6f6d37c35a43a2834b62e12b7daa7e166fbe78
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/yaffs2/yaffs_vfs.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c index d5b875314005..d95875fe1e57 100644 --- a/fs/yaffs2/yaffs_vfs.c +++ b/fs/yaffs2/yaffs_vfs.c @@ -43,7 +43,6 @@ #include <linux/init.h> #include <linux/fs.h> #include <linux/proc_fs.h> -#include <linux/smp_lock.h> #include <linux/pagemap.h> #include <linux/mtd/mtd.h> #include <linux/interrupt.h> @@ -2375,19 +2374,19 @@ static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data, return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL; } -static int yaffs_read_super(struct file_system_type *fs, +static struct dentry *yaffs_read_super(struct file_system_type *fs, int flags, const char *dev_name, - void *data, struct vfsmount *mnt) + void *data) { - return get_sb_bdev(fs, flags, dev_name, data, - yaffs_internal_read_super_mtd, mnt); + return mount_bdev(fs, flags, dev_name, data, + yaffs_internal_read_super_mtd); } static struct file_system_type yaffs_fs_type = { .owner = THIS_MODULE, .name = "yaffs", - .get_sb = yaffs_read_super, + .mount = yaffs_read_super, .kill_sb = kill_block_super, .fs_flags = FS_REQUIRES_DEV, }; @@ -2400,18 +2399,17 @@ static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data, return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL; } -static int yaffs2_read_super(struct file_system_type *fs, - int flags, const char *dev_name, void *data, - struct vfsmount *mnt) +static struct dentry *yaffs2_read_super(struct file_system_type *fs, + int flags, const char *dev_name, void *data) { - return get_sb_bdev(fs, flags, dev_name, data, - yaffs2_internal_read_super_mtd, mnt); + return mount_bdev(fs, flags, dev_name, data, + yaffs2_internal_read_super_mtd); } static struct file_system_type yaffs2_fs_type = { .owner = THIS_MODULE, .name = "yaffs2", - .get_sb = yaffs2_read_super, + .mount = yaffs2_read_super, .kill_sb = kill_block_super, .fs_flags = FS_REQUIRES_DEV, }; |