提交 d753ed97 编写于 作者: A Al Viro

convert cifs

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 e4c59d61
...@@ -545,9 +545,9 @@ static const struct super_operations cifs_super_ops = { ...@@ -545,9 +545,9 @@ static const struct super_operations cifs_super_ops = {
#endif #endif
}; };
static int static struct dentry *
cifs_get_sb(struct file_system_type *fs_type, cifs_do_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data, struct vfsmount *mnt) int flags, const char *dev_name, void *data)
{ {
int rc; int rc;
struct super_block *sb; struct super_block *sb;
...@@ -557,18 +557,17 @@ cifs_get_sb(struct file_system_type *fs_type, ...@@ -557,18 +557,17 @@ cifs_get_sb(struct file_system_type *fs_type,
cFYI(1, "Devname: %s flags: %d ", dev_name, flags); cFYI(1, "Devname: %s flags: %d ", dev_name, flags);
if (IS_ERR(sb)) if (IS_ERR(sb))
return PTR_ERR(sb); return ERR_CAST(sb);
sb->s_flags = flags; sb->s_flags = flags;
rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0); rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0);
if (rc) { if (rc) {
deactivate_locked_super(sb); deactivate_locked_super(sb);
return rc; return ERR_PTR(rc);
} }
sb->s_flags |= MS_ACTIVE; sb->s_flags |= MS_ACTIVE;
simple_set_mnt(mnt, sb); return dget(sb->s_root);
return 0;
} }
static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
...@@ -634,7 +633,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) ...@@ -634,7 +633,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)
struct file_system_type cifs_fs_type = { struct file_system_type cifs_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "cifs", .name = "cifs",
.get_sb = cifs_get_sb, .mount = cifs_do_mount,
.kill_sb = kill_anon_super, .kill_sb = kill_anon_super,
/* .fs_flags */ /* .fs_flags */
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册