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
/
isofs
/
inode.c
diff --git
a/fs/isofs/inode.c
b/fs/isofs/inode.c
index
79cf7f6
..
bfdeb82
100644
(file)
--- a/
fs/isofs/inode.c
+++ b/
fs/isofs/inode.c
@@
-1507,17
+1507,16
@@
struct inode *isofs_iget(struct super_block *sb,
return inode;
}
return inode;
}
-static
int isofs_get_sb
(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
+static
struct dentry *isofs_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, isofs_fill_super,
- mnt);
+ return mount_bdev(fs_type, flags, dev_name, data, isofs_fill_super);
}
static struct file_system_type iso9660_fs_type = {
.owner = THIS_MODULE,
.name = "iso9660",
}
static struct file_system_type iso9660_fs_type = {
.owner = THIS_MODULE,
.name = "iso9660",
- .
get_sb = isofs_get_sb
,
+ .
mount = isofs_mount
,
.kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV,
};
.kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV,
};