git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
[pandora-kernel.git]
/
fs
/
adfs
/
super.c
diff --git
a/fs/adfs/super.c
b/fs/adfs/super.c
index
d9803f7
..
959dbff
100644
(file)
--- a/
fs/adfs/super.c
+++ b/
fs/adfs/super.c
@@
-490,17
+490,16
@@
error:
return -EINVAL;
}
return -EINVAL;
}
-static
int adfs_get_sb
(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
+static
struct dentry *adfs_mount
(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data)
{
{
- return get_sb_bdev(fs_type, flags, dev_name, data, adfs_fill_super,
- mnt);
+ return mount_bdev(fs_type, flags, dev_name, data, adfs_fill_super);
}
static struct file_system_type adfs_fs_type = {
.owner = THIS_MODULE,
.name = "adfs",
}
static struct file_system_type adfs_fs_type = {
.owner = THIS_MODULE,
.name = "adfs",
- .
get_sb = adfs_get_sb
,
+ .
mount = adfs_mount
,
.kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV,
};
.kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV,
};