Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3285 merge: 'dom' branch merging
[fs/lustre-release.git]
/
lustre
/
mdt
/
mdt_mds.c
diff --git
a/lustre/mdt/mdt_mds.c
b/lustre/mdt/mdt_mds.c
index
078051a
..
b9c806f
100644
(file)
--- a/
lustre/mdt/mdt_mds.c
+++ b/
lustre/mdt/mdt_mds.c
@@
-66,7
+66,6
@@
struct mds_device {
struct ptlrpc_service *mds_fld_service;
struct ptlrpc_service *mds_io_service;
struct mutex mds_health_mutex;
struct ptlrpc_service *mds_fld_service;
struct ptlrpc_service *mds_io_service;
struct mutex mds_health_mutex;
- struct kset *mds_kset;
};
/*
};
/*
@@
-193,7
+192,7
@@
static int mds_start_ptlrpc_service(struct mds_device *m)
.so_hpreq_handler = ptlrpc_hpreq_handler,
},
};
.so_hpreq_handler = ptlrpc_hpreq_handler,
},
};
- m->mds_regular_service = ptlrpc_register_service(&conf,
m->mds
_kset,
+ m->mds_regular_service = ptlrpc_register_service(&conf,
&obd->obd
_kset,
procfs_entry);
if (IS_ERR(m->mds_regular_service)) {
rc = PTR_ERR(m->mds_regular_service);
procfs_entry);
if (IS_ERR(m->mds_regular_service)) {
rc = PTR_ERR(m->mds_regular_service);
@@
-237,7
+236,7
@@
static int mds_start_ptlrpc_service(struct mds_device *m)
.so_req_printer = target_print_req,
},
};
.so_req_printer = target_print_req,
},
};
- m->mds_readpage_service = ptlrpc_register_service(&conf,
m->mds
_kset,
+ m->mds_readpage_service = ptlrpc_register_service(&conf,
&obd->obd
_kset,
procfs_entry);
if (IS_ERR(m->mds_readpage_service)) {
rc = PTR_ERR(m->mds_readpage_service);
procfs_entry);
if (IS_ERR(m->mds_readpage_service)) {
rc = PTR_ERR(m->mds_readpage_service);
@@
-285,7
+284,7
@@
static int mds_start_ptlrpc_service(struct mds_device *m)
.so_hpreq_handler = NULL,
},
};
.so_hpreq_handler = NULL,
},
};
- m->mds_setattr_service = ptlrpc_register_service(&conf,
m->mds
_kset,
+ m->mds_setattr_service = ptlrpc_register_service(&conf,
&obd->obd
_kset,
procfs_entry);
if (IS_ERR(m->mds_setattr_service)) {
rc = PTR_ERR(m->mds_setattr_service);
procfs_entry);
if (IS_ERR(m->mds_setattr_service)) {
rc = PTR_ERR(m->mds_setattr_service);
@@
-331,7
+330,7
@@
static int mds_start_ptlrpc_service(struct mds_device *m)
.so_hpreq_handler = NULL,
},
};
.so_hpreq_handler = NULL,
},
};
- m->mds_out_service = ptlrpc_register_service(&conf,
m->mds
_kset,
+ m->mds_out_service = ptlrpc_register_service(&conf,
&obd->obd
_kset,
procfs_entry);
if (IS_ERR(m->mds_out_service)) {
rc = PTR_ERR(m->mds_out_service);
procfs_entry);
if (IS_ERR(m->mds_out_service)) {
rc = PTR_ERR(m->mds_out_service);
@@
-367,7
+366,7
@@
static int mds_start_ptlrpc_service(struct mds_device *m)
.so_hpreq_handler = NULL,
},
};
.so_hpreq_handler = NULL,
},
};
- m->mds_mdsc_service = ptlrpc_register_service(&conf,
m->mds
_kset,
+ m->mds_mdsc_service = ptlrpc_register_service(&conf,
&obd->obd
_kset,
procfs_entry);
if (IS_ERR(m->mds_mdsc_service)) {
rc = PTR_ERR(m->mds_mdsc_service);
procfs_entry);
if (IS_ERR(m->mds_mdsc_service)) {
rc = PTR_ERR(m->mds_mdsc_service);
@@
-404,7
+403,7
@@
static int mds_start_ptlrpc_service(struct mds_device *m)
.so_hpreq_handler = NULL,
},
};
.so_hpreq_handler = NULL,
},
};
- m->mds_mdss_service = ptlrpc_register_service(&conf,
m->mds
_kset,
+ m->mds_mdss_service = ptlrpc_register_service(&conf,
&obd->obd
_kset,
procfs_entry);
if (IS_ERR(m->mds_mdss_service)) {
rc = PTR_ERR(m->mds_mdss_service);
procfs_entry);
if (IS_ERR(m->mds_mdss_service)) {
rc = PTR_ERR(m->mds_mdss_service);
@@
-439,7
+438,7
@@
static int mds_start_ptlrpc_service(struct mds_device *m)
.so_hpreq_handler = NULL,
},
};
.so_hpreq_handler = NULL,
},
};
- m->mds_fld_service = ptlrpc_register_service(&conf,
m->mds
_kset,
+ m->mds_fld_service = ptlrpc_register_service(&conf,
&obd->obd
_kset,
procfs_entry);
if (IS_ERR(m->mds_fld_service)) {
rc = PTR_ERR(m->mds_fld_service);
procfs_entry);
if (IS_ERR(m->mds_fld_service)) {
rc = PTR_ERR(m->mds_fld_service);
@@
-477,7
+476,7
@@
static int mds_start_ptlrpc_service(struct mds_device *m)
.so_req_printer = target_print_req,
},
};
.so_req_printer = target_print_req,
},
};
- m->mds_io_service = ptlrpc_register_service(&conf,
m->mds
_kset,
+ m->mds_io_service = ptlrpc_register_service(&conf,
&obd->obd
_kset,
procfs_entry);
if (IS_ERR(m->mds_io_service)) {
rc = PTR_ERR(m->mds_io_service);
procfs_entry);
if (IS_ERR(m->mds_io_service)) {
rc = PTR_ERR(m->mds_io_service);
@@
-507,7
+506,7
@@
static struct lu_device *mds_device_fini(const struct lu_env *env,
ENTRY;
mds_stop_ptlrpc_service(m);
ENTRY;
mds_stop_ptlrpc_service(m);
- lprocfs_
kset_unregister(obd, m->mds_kset
);
+ lprocfs_
obd_cleanup(obd
);
RETURN(NULL);
}
RETURN(NULL);
}
@@
-545,7
+544,7
@@
static struct lu_device *mds_device_alloc(const struct lu_env *env,
/* set this lu_device to obd, because error handling need it */
obd->obd_lu_dev = l;
/* set this lu_device to obd, because error handling need it */
obd->obd_lu_dev = l;
- rc = lprocfs_
kset_register(obd, &m->mds_kset
);
+ rc = lprocfs_
obd_setup(obd, true
);
if (rc != 0) {
mds_device_free(env, l);
l = ERR_PTR(rc);
if (rc != 0) {
mds_device_free(env, l);
l = ERR_PTR(rc);
@@
-556,7
+555,7
@@
static struct lu_device *mds_device_alloc(const struct lu_env *env,
rc = mds_start_ptlrpc_service(m);
if (rc != 0) {
rc = mds_start_ptlrpc_service(m);
if (rc != 0) {
- lprocfs_
kset_unregister(obd, m->mds_kset
);
+ lprocfs_
obd_cleanup(obd
);
mds_device_free(env, l);
l = ERR_PTR(rc);
return l;
mds_device_free(env, l);
l = ERR_PTR(rc);
return l;