Commit 5c90062c authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] (6/8) ->get_sb() switchover

converte usb to ->get_sb()
parent 19bdc672
......@@ -364,15 +364,14 @@ static struct super_operations usbfs_ops = {
put_inode: force_delete,
};
static struct super_block *usbfs_read_super (struct super_block *sb, void *data,
int silent)
static int usbfs_fill_super(struct super_block *sb, void *data, int silent)
{
struct inode *inode;
struct dentry *root;
if (parse_options(sb, data)) {
warn("usbfs: mount parameter error:");
return NULL;
return -EINVAL;
}
sb->s_blocksize = PAGE_CACHE_SIZE;
......@@ -383,17 +382,17 @@ static struct super_block *usbfs_read_super (struct super_block *sb, void *data,
if (!inode) {
dbg("%s: could not get inode!\n",__FUNCTION__);
return NULL;
return -ENOMEM;
}
root = d_alloc_root(inode);
if (!root) {
dbg("%s: could not get root dentry!\n",__FUNCTION__);
iput(inode);
return NULL;
return -ENOMEM;
}
sb->s_root = root;
return sb;
return 0;
}
/**
......@@ -522,6 +521,25 @@ static void fs_remove_file (struct dentry *dentry)
* It will be removed when the 2.7.x development cycle is started.
* You have been warned :)
*/
static struct super_block *usb_get_sb(struct file_system_type *fs_type,
int flags, char *dev_name, void *data)
{
return get_sb_single(fs_type, flags, data, usb_fill_super);
}
static struct file_system_type usbdevice_fs_type = {
owner: THIS_MODULE,
name: "usbdevfs",
get_sb: usb_get_sb,
};
static struct file_system_type usb_fs_type = {
owner: THIS_MODULE,
name: "usbfs",
get_sb: usb_get_sb,
};
static DECLARE_FSTYPE(usbdevice_fs_type, "usbdevfs", usbfs_read_super, FS_SINGLE);
static DECLARE_FSTYPE(usb_fs_type, "usbfs", usbfs_read_super, FS_SINGLE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment