Commit 7dc21551 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman

staging: lustre: obdclass: remove vfsmount option from client_fill_super

This arg is always NULL and is never used.
So discard it from this and related functions.
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 998831a0
...@@ -141,8 +141,7 @@ struct lustre_sb_info { ...@@ -141,8 +141,7 @@ struct lustre_sb_info {
/* obd_mount.c */ /* obd_mount.c */
int lustre_start_mgc(struct super_block *sb); int lustre_start_mgc(struct super_block *sb);
void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb, void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb));
struct vfsmount *mnt));
void lustre_register_kill_super_cb(void (*cfs)(struct super_block *sb)); void lustre_register_kill_super_cb(void (*cfs)(struct super_block *sb));
int lustre_common_put_super(struct super_block *sb); int lustre_common_put_super(struct super_block *sb);
......
...@@ -792,7 +792,7 @@ int ll_revalidate_it_finish(struct ptlrpc_request *request, ...@@ -792,7 +792,7 @@ int ll_revalidate_it_finish(struct ptlrpc_request *request,
extern struct super_operations lustre_super_operations; extern struct super_operations lustre_super_operations;
void ll_lli_init(struct ll_inode_info *lli); void ll_lli_init(struct ll_inode_info *lli);
int ll_fill_super(struct super_block *sb, struct vfsmount *mnt); int ll_fill_super(struct super_block *sb);
void ll_put_super(struct super_block *sb); void ll_put_super(struct super_block *sb);
void ll_kill_super(struct super_block *sb); void ll_kill_super(struct super_block *sb);
struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock); struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock);
......
...@@ -146,8 +146,7 @@ static void ll_free_sbi(struct super_block *sb) ...@@ -146,8 +146,7 @@ static void ll_free_sbi(struct super_block *sb)
kfree(sbi); kfree(sbi);
} }
static int client_common_fill_super(struct super_block *sb, char *md, char *dt, static int client_common_fill_super(struct super_block *sb, char *md, char *dt)
struct vfsmount *mnt)
{ {
struct inode *root = NULL; struct inode *root = NULL;
struct ll_sb_info *sbi = ll_s2sbi(sb); struct ll_sb_info *sbi = ll_s2sbi(sb);
...@@ -867,7 +866,7 @@ void ll_lli_init(struct ll_inode_info *lli) ...@@ -867,7 +866,7 @@ void ll_lli_init(struct ll_inode_info *lli)
mutex_init(&lli->lli_layout_mutex); mutex_init(&lli->lli_layout_mutex);
} }
int ll_fill_super(struct super_block *sb, struct vfsmount *mnt) int ll_fill_super(struct super_block *sb)
{ {
struct lustre_profile *lprof = NULL; struct lustre_profile *lprof = NULL;
struct lustre_sb_info *lsi = s2lsi(sb); struct lustre_sb_info *lsi = s2lsi(sb);
...@@ -944,7 +943,7 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt) ...@@ -944,7 +943,7 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
} }
/* connections, registrations, sb setup */ /* connections, registrations, sb setup */
err = client_common_fill_super(sb, md, dt, mnt); err = client_common_fill_super(sb, md, dt);
if (!err) if (!err)
sbi->ll_client_common_fill_super_succeeded = 1; sbi->ll_client_common_fill_super_succeeded = 1;
......
...@@ -49,8 +49,7 @@ ...@@ -49,8 +49,7 @@
#include <lustre_disk.h> #include <lustre_disk.h>
#include <uapi/linux/lustre/lustre_param.h> #include <uapi/linux/lustre/lustre_param.h>
static int (*client_fill_super)(struct super_block *sb, static int (*client_fill_super)(struct super_block *sb);
struct vfsmount *mnt);
static void (*kill_super_cb)(struct super_block *sb); static void (*kill_super_cb)(struct super_block *sb);
...@@ -1159,7 +1158,7 @@ static int lustre_fill_super(struct super_block *sb, void *lmd2_data, int silent ...@@ -1159,7 +1158,7 @@ static int lustre_fill_super(struct super_block *sb, void *lmd2_data, int silent
} }
/* Connect and start */ /* Connect and start */
/* (should always be ll_fill_super) */ /* (should always be ll_fill_super) */
rc = (*client_fill_super)(sb, NULL); rc = (*client_fill_super)(sb);
/* c_f_s will call lustre_common_put_super on failure */ /* c_f_s will call lustre_common_put_super on failure */
} }
} else { } else {
...@@ -1186,8 +1185,7 @@ static int lustre_fill_super(struct super_block *sb, void *lmd2_data, int silent ...@@ -1186,8 +1185,7 @@ static int lustre_fill_super(struct super_block *sb, void *lmd2_data, int silent
/* We can't call ll_fill_super by name because it lives in a module that /* We can't call ll_fill_super by name because it lives in a module that
* must be loaded after this one. * must be loaded after this one.
*/ */
void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb, void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb))
struct vfsmount *mnt))
{ {
client_fill_super = cfs; client_fill_super = cfs;
} }
......
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