From: NeilBrown Date: Thu, 12 Dec 2019 14:58:32 +0000 (-0500) Subject: LU-12514 obdclass: remove vfsmount option from client_fill_super X-Git-Tag: 2.13.51~57 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=0f3bec02fc5da0c5bb61eda482b5c954a00bf6bd LU-12514 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. Linux-commit: 7dc2155195586ec75f53d6dcd381f935ccc35d02 Change-Id: I00b16115edbff0de7605768121981b928585552c Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman Reviewed-on: https://review.whamcloud.com/35427 Reviewed-by: Andreas Dilger Reviewed-by: Neil Brown Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.h index ea6c498..fc5ae21 100644 --- a/lustre/include/lustre_disk.h +++ b/lustre/include/lustre_disk.h @@ -348,8 +348,7 @@ int lustre_start_mgc(struct super_block *sb); int server_name2fsname(const char *svname, char *fsname, const char **endptr); void obdname2fsname(const char *tgt, char *fsname, size_t fslen); -void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb, - struct vfsmount *mnt)); +void lustre_register_client_fill_super(int (*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); diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h index 82e3ca6..6e71a31 100644 --- a/lustre/llite/llite_internal.h +++ b/lustre/llite/llite_internal.h @@ -983,7 +983,7 @@ int ll_revalidate_it_finish(struct ptlrpc_request *request, extern struct super_operations lustre_super_operations; 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_kill_super(struct super_block *sb); struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock); diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index a47d84b..bdf1b0a 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -191,8 +191,7 @@ static void ll_free_sbi(struct super_block *sb) EXIT; } -static int client_common_fill_super(struct super_block *sb, char *md, char *dt, - struct vfsmount *mnt) +static int client_common_fill_super(struct super_block *sb, char *md, char *dt) { struct inode *root = NULL; struct ll_sb_info *sbi = ll_s2sbi(sb); @@ -1054,7 +1053,7 @@ static int super_setup_bdi_name(struct super_block *sb, char *fmt, ...) } #endif /* !HAVE_SUPER_SETUP_BDI_NAME */ -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_sb_info *lsi = s2lsi(sb); @@ -1175,7 +1174,7 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt) snprintf(md, md_len - 1, "%s-%016lx", lprof->lp_md, cfg_instance); /* connections, registrations, sb setup */ - err = client_common_fill_super(sb, md, dt, mnt); + err = client_common_fill_super(sb, md, dt); if (err < 0) GOTO(out_free_md, err); diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 8d3f77e..1520148 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -50,8 +50,7 @@ #include #include -static int (*client_fill_super)(struct super_block *sb, - struct vfsmount *mnt); +static int (*client_fill_super)(struct super_block *sb); static void (*kill_super_cb)(struct super_block *sb); @@ -1637,7 +1636,7 @@ static int lustre_fill_super(struct super_block *sb, void *lmd2_data, } /* Connect and start */ /* (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 */ } } else { @@ -1678,8 +1677,7 @@ out: * We can't call ll_fill_super by name because it lives in a module that * must be loaded after this one. */ -void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb, - struct vfsmount *mnt)) +void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb)) { client_fill_super = cfs; }