staging/lustre: yet more dead code removal
cover staging/lustre: yet more dead code removal
From: "John L. Hammond" <[email protected]>
Howdy,
This series yet removes more dead and obsolete code from drivers/staging/lustre in the form of methods from struct obd_ops and server specific llog handling.
John L. Hammond (12):
staging/lustre/lov: remove unused OBD methods staging/lustre/osc: remove unused OBD methods staging/lustre/osc: remove obsolete llog handling code staging/lustre: remove obd_ost.h staging/lustre/mdc: remove unused OBD methods staging/lustre/mdc: inline llog methods staging/lustre/mgc: inline mgc_cancel() staging/lustre: remove unused OBD methods staging/lustre/mgc: remove server specific llog handling staging/lustre/ptlrpc: remove sptlrpc_conf_target_get_rules() staging/lustre/obdclass: remove llog_ioctl.c staging/lustre/obdclass: remove local_storage.[ch]
.../staging/lustre/lustre/include/lustre_lite.h | 1 - drivers/staging/lustre/lustre/include/lustre_log.h | 10 - drivers/staging/lustre/lustre/include/lustre_sec.h | 3 - drivers/staging/lustre/lustre/include/obd.h | 47 - drivers/staging/lustre/lustre/include/obd_class.h | 279 ------ drivers/staging/lustre/lustre/include/obd_ost.h | 100 --- drivers/staging/lustre/lustre/lov/lov_internal.h | 45 - drivers/staging/lustre/lustre/lov/lov_merge.c | 27 - drivers/staging/lustre/lustre/lov/lov_obd.c | 531 ------------ drivers/staging/lustre/lustre/lov/lov_pack.c | 172 ---- drivers/staging/lustre/lustre/lov/lov_request.c | 784 ----------------- drivers/staging/lustre/lustre/mdc/mdc_request.c | 157 +--- drivers/staging/lustre/lustre/mgc/mgc_request.c | 101 +-- drivers/staging/lustre/lustre/obdclass/Makefile | 4 +- drivers/staging/lustre/lustre/obdclass/debug.c | 1 - drivers/staging/lustre/lustre/obdclass/genops.c | 1 - .../staging/lustre/lustre/obdclass/llog_ioctl.c | 418 --------- drivers/staging/lustre/lustre/obdclass/llog_obd.c | 25 - .../staging/lustre/lustre/obdclass/local_storage.c | 894 -------------------- .../staging/lustre/lustre/obdclass/local_storage.h | 91 -- .../lustre/lustre/obdclass/lprocfs_status.c | 20 - .../staging/lustre/lustre/osc/osc_cl_internal.h | 1 - drivers/staging/lustre/lustre/osc/osc_quota.c | 2 +- drivers/staging/lustre/lustre/osc/osc_request.c | 401 +-------- drivers/staging/lustre/lustre/ptlrpc/recover.c | 1 - drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 327 ------- 26 files changed, 82 insertions(+), 4361 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/obd_ost.h delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_ioctl.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.h
Signature · 1 line
1.7.9.5
PATCH 1/12 staging/lustre/lov: remove unused OBD methods
From: "John L. Hammond" <[email protected]>
Remove the unused OBD device methods:
lov_brw()
lov_cancel()
lov_cancel_unused()
lov_change_cbdata()
lov_enqueue()
lov_extent_calc()
lov_getattr()
lov_merge_lvb()
lov_punch()
lov_setattr()
lov_sync()and their supporting functions.
In lov_iocontrol() remove the unused cases LL_IOC_LOV_SETSTRIPE and LL_IOC_LOV_SETEA and their supporting functions.
--- drivers/staging/lustre/lustre/lov/lov_internal.h | 45 -- drivers/staging/lustre/lustre/lov/lov_merge.c | 27 - drivers/staging/lustre/lustre/lov/lov_obd.c | 530 --------------- drivers/staging/lustre/lustre/lov/lov_pack.c | 172 ----- drivers/staging/lustre/lustre/lov/lov_request.c | 783 ---------------------- 5 files changed, 1557 deletions(-)
drivers/staging/lustre/lustre/lov/lov_internal.h +0 -45
@@ -168,8 +168,6 @@ static inline void lov_llh_put(struct lov_lock_handles *llh)/* lov_merge.c */ void lov_merge_attrs (struct obdo *tgt,struct obdo *src,u64 valid,struct lov_stripe_md *lsm,int stripeno,int *set); -int lov_merge_lvb (struct obd_export *exp,struct lov_stripe_md *lsm, -struct ost_lvb *lvb,int kms_only);int lov_adjust_kms (struct obd_export *exp,struct lov_stripe_md *lsm,u64 size,int shrink); int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
@@ -207,17 +205,6 @@ void lov_update_set(struct lov_request_set *set,int lov_update_common_set (struct lov_request_set *set,struct lov_request *req,int rc);int lov_check_and_wait_active (struct lov_obd *lov,int ost_idx); -int lov_prep_create_set (struct obd_export *exp,struct obd_info *oifo, -struct lov_stripe_md **ea,struct obdo *src_oa, -struct obd_trans_info *oti, -struct lov_request_set **reqset); -int cb_create_update (void *cookie,int rc); -int lov_fini_create_set (struct lov_request_set *set,struct lov_stripe_md **ea); -int lov_prep_brw_set (struct obd_export *exp,struct obd_info *oinfo, -u32 oa_bufs,struct brw_page *pga, -struct obd_trans_info *oti, -struct lov_request_set **reqset); -int lov_fini_brw_set (struct lov_request_set *set);int lov_prep_getattr_set (struct obd_export *exp,struct obd_info *oinfo,struct lov_request_set **reqset);int lov_fini_getattr_set (struct lov_request_set *set);
@@ -225,8 +212,6 @@ int lov_prep_destroy_set(struct obd_export *exp, struct obd_info *oinfo, struct obdo *src_oa, struct lov_stripe_md *lsm, struct obd_trans_info *oti, struct lov_request_set **reqset); -int lov_update_destroy_set (struct lov_request_set *set, -struct lov_request *req,int rc);int lov_fini_destroy_set (struct lov_request_set *set); int lov_prep_setattr_set(struct obd_export *exp, struct obd_info *oinfo, struct obd_trans_info *oti,
@@ -234,30 +219,6 @@ int lov_prep_setattr_set(struct obd_export *exp, struct obd_info *oinfo,int lov_update_setattr_set (struct lov_request_set *set,struct lov_request *req,int rc);int lov_fini_setattr_set (struct lov_request_set *set); -int lov_prep_punch_set (struct obd_export *exp,struct obd_info *oinfo, -struct obd_trans_info *oti, -struct lov_request_set **reqset); -int lov_fini_punch_set (struct lov_request_set *set); -int lov_prep_sync_set (struct obd_export *exp,struct obd_info *obd_info, -u64 start,u64 end, -struct lov_request_set **reqset); -int lov_fini_sync_set (struct lov_request_set *set); -int lov_prep_enqueue_set (struct obd_export *exp,struct obd_info *oinfo, -struct ldlm_enqueue_info *einfo, -struct lov_request_set **reqset); -int lov_fini_enqueue_set (struct lov_request_set *set,__u32 mode,int rc, -struct ptlrpc_request_set *rqset); -int lov_prep_match_set (struct obd_export *exp,struct obd_info *oinfo, -struct lov_stripe_md *lsm, -ldlm_policy_data_t *policy,__u32 mode, -struct lustre_handle *lockh, -struct lov_request_set **reqset); -int lov_fini_match_set (struct lov_request_set *set,__u32 mode,__u64 flags); -int lov_prep_cancel_set (struct obd_export *exp,struct obd_info *oinfo, -struct lov_stripe_md *lsm, -__u32 mode,struct lustre_handle *lockh, -struct lov_request_set **reqset); -int lov_fini_cancel_set (struct lov_request_set *set);int lov_prep_statfs_set (struct obd_device *obd,struct obd_info *oinfo,struct lov_request_set **reqset); void lov_update_statfs(struct obd_statfs *osfs, struct obd_statfs *lov_sfs,
@@ -287,10 +248,6 @@ int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmm, struct lov_stripe_md *lsm);int lov_unpackmd (struct obd_export *exp,struct lov_stripe_md **lsmp,struct lov_mds_md *lmm,int lmm_bytes); -int lov_setstripe (struct obd_export *exp,int max_lmm_size, -struct lov_stripe_md **lsmp,struct lov_user_md *lump); -int lov_setea (struct obd_export *exp,struct lov_stripe_md **lsmp, -struct lov_user_md *lump);int lov_getstripe (struct obd_export *exp,struct lov_stripe_md *lsm,struct lov_user_md *lump); int lov_alloc_memmd(struct lov_stripe_md **lsmp, __u16 stripe_count,
@@ -307,8 +264,6 @@ struct lov_stripe_md *lsm_alloc_plain(__u16 stripe_count, int *size);void lsm_free_plain (struct lov_stripe_md *lsm);void dump_lsm (unsigned int level,const struct lov_stripe_md *lsm); -int lovea_destroy_object (struct lov_obd *lov,struct lov_stripe_md *lsm, -struct obdo *oa,void *data);/* lproc_lov.c */ #if defined (CONFIG_PROC_FS )extern const struct file_operations lov_proc_target_fops;
drivers/staging/lustre/lustre/lov/lov_merge.c +0 -27
@@ -109,33 +109,6 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,return rc; } -/** Merge the lock value block(&lvb) attributes from each of the stripes in a -* file into a single lvb. It is expected that the caller initializes the -* current atime, mtime, ctime to avoid regressing a more uptodate time on -* the local client. -* -* If \a kms_only is set then we do not consider the recently seen size (rss) -* when updating the known minimum size (kms). Even when merging RSS, we will -* take the KMS value if it's larger. This prevents getattr from stomping on -* dirty cached pages which extend the file size. */ -int lov_merge_lvb (struct obd_export *exp, -struct lov_stripe_md *lsm,struct ost_lvb *lvb,int kms_only) -{ -int rc; -__u64 kms; - -lov_stripe_lock (lsm); - rc =lov_merge_lvb_kms (lsm, lvb, &kms); -lov_stripe_unlock (lsm); -if (kms_only) - lvb->lvb_size = kms; - -CDEBUG (D_INODE ,"merged for ID " DOSTID " s=%llu m=%llu a=%llu c=%llu b=%llu\n" , -POSTID (&lsm->lsm_oi), lvb->lvb_size, lvb->lvb_mtime, - lvb->lvb_atime, lvb->lvb_ctime, lvb->lvb_blocks); -return rc; -} -/* Must be called under the lov_stripe_lock() */ int lov_adjust_kms (struct obd_export *exp,struct lov_stripe_md *lsm,u64 size,int shrink)
drivers/staging/lustre/lustre/lov/lov_obd.c +0 -530
582 lines not on this page · raw message
drivers/staging/lustre/lustre/lov/lov_pack.c +0 -172
178 lines not on this page · raw message
drivers/staging/lustre/lustre/lov/lov_request.c +0 -783
801 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/12 staging/lustre/osc: remove unused OBD methods
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
Remove the unused OBD device methods:
osc_brw()
osc_cancel()
osc_cancel_unused()
osc_change_cbdata()
osc_enqueue()
osc_punch()
osc_sync()and their supporting functions.
--- drivers/staging/lustre/lustre/osc/osc_request.c | 264 ----------------------- 1 file changed, 264 deletions(-)
drivers/staging/lustre/lustre/osc/osc_request.c +0 -264
@@ -537,17 +537,6 @@ int osc_punch_base(struct obd_export *exp, struct obd_info *oinfo,return 0 ; } -static int osc_punch (const struct lu_env *env,struct obd_export *exp, -struct obd_info *oinfo,struct obd_trans_info *oti, -struct ptlrpc_request_set *rqset) -{ - oinfo->oi_oa->o_size = oinfo->oi_policy.l_extent.start; - oinfo->oi_oa->o_blocks = oinfo->oi_policy.l_extent.end; - oinfo->oi_oa->o_valid |=OBD_MD_FLSIZE |OBD_MD_FLBLOCKS ; -return osc_punch_base (exp, oinfo, - oinfo->oi_cb_up, oinfo, rqset); -} -static int osc_sync_interpret (const struct lu_env *env,struct ptlrpc_request *req,void *arg,int rc)
@@ -614,22 +603,6 @@ int osc_sync_base(struct obd_export *exp, struct obd_info *oinfo,return 0 ; } -static int osc_sync (const struct lu_env *env,struct obd_export *exp, -struct obd_info *oinfo,u64 start,u64 end, -struct ptlrpc_request_set *set) -{ -if (!oinfo->oi_oa) { -CDEBUG (D_INFO ,"oa NULL\n" ); -return -EINVAL ; - } - - oinfo->oi_oa->o_size = start; - oinfo->oi_oa->o_blocks = end; - oinfo->oi_oa->o_valid |= (OBD_MD_FLSIZE |OBD_MD_FLBLOCKS ); - -return osc_sync_base (exp, oinfo, oinfo->oi_cb_up, oinfo, set); -} -/* Find and cancel locally locks matched by @mode in the resource found by * @objid. Found locks are added into @cancel list. Returns the amount of * locks added to @cancels list. */
@@ -1618,74 +1591,6 @@ out:return rc; } -static int osc_brw_internal (int cmd,struct obd_export *exp,struct obdo *oa, -struct lov_stripe_md *lsm, -u32 page_count,struct brw_page **pga, -struct obd_capa *ocapa) -{ -struct ptlrpc_request *req; -int rc; -wait_queue_head_t waitq; -int generation, resends =0 ; -struct l_wait_info lwi; - -init_waitqueue_head (&waitq); - generation = exp->exp_obd->u.cli.cl_import->imp_generation; - -restart_bulk: - rc =osc_brw_prep_request (cmd, &exp->exp_obd->u.cli, oa, lsm, - page_count, pga, &req, ocapa,0 , resends); -if (rc !=0 ) -return rc; - -if (resends) { - req->rq_generation_set =1 ; - req->rq_import_generation = generation; - req->rq_sent =get_seconds () + resends; - } - - rc =ptlrpc_queue_wait (req); - -if (rc == -ETIMEDOUT && req->rq_resend) { -DEBUG_REQ (D_HA , req,"BULK TIMEOUT" ); -ptlrpc_req_finished (req); - goto restart_bulk; - } - - rc =osc_brw_fini_request (req, rc); - -ptlrpc_req_finished (req); -/* When server return -EINPROGRESS, client should always retry -* regardless of the number of times the bulk was resent already.*/ -if (osc_recoverable_error (rc)) { - resends++; -if (rc != -EINPROGRESS && - !client_should_resend (resends, &exp->exp_obd->u.cli)) { -CERROR ("%s: too many resend retries for object: " -"" DOSTID ", rc = %d.\n" , exp->exp_obd->obd_name, -POSTID (&oa->o_oi), rc); - goto out; - } -if (generation != - exp->exp_obd->u.cli.cl_import->imp_generation) { -CDEBUG (D_HA ,"%s: resend cross eviction for object: " -"" DOSTID ", rc = %d.\n" , exp->exp_obd->obd_name, -POSTID (&oa->o_oi), rc); - goto out; - } - - lwi =LWI_TIMEOUT_INTR (cfs_time_seconds (resends),NULL ,NULL , -NULL ); -l_wait_event (waitq,0 , &lwi); - - goto restart_bulk; - } -out: -if (rc == -EAGAIN || rc == -EINPROGRESS ) - rc = -EIO ; -return rc; -} -static int osc_brw_redo_request (struct ptlrpc_request *request,struct osc_brw_async_args *aa,int rc) {
@@ -1789,125 +1694,12 @@ static void sort_brw_pages(struct brw_page **array, int num) }while (stride >1 ); } -static u32 max_unfragmented_pages (struct brw_page **pg,u32 pages) -{ -int count =1 ; -int offset; -int i =0 ; - -LASSERT (pages >0 ); - offset = pg[i]->off & ~CFS_PAGE_MASK ; - -for (;;) { - pages--; -if (pages ==0 )/* that's all */ -return count; - -if (offset + pg[i]->count <PAGE_CACHE_SIZE ) -return count;/* doesn't end on page boundary */ - - i++; - offset = pg[i]->off & ~CFS_PAGE_MASK ; -if (offset !=0 )/* doesn't start on page boundary */ -return count; - - count++; - } -} - -static struct brw_page **osc_build_ppga (struct brw_page *pga,u32 count) -{ -struct brw_page **ppga; -int i; - -OBD_ALLOC (ppga,sizeof (*ppga) * count); -if (ppga ==NULL ) -return NULL ; - -for (i =0 ; i < count; i++) - ppga[i] = pga + i; -return ppga; -} -static void osc_release_ppga (struct brw_page **ppga,u32 count) {LASSERT (ppga !=NULL );OBD_FREE (ppga,sizeof (*ppga) * count); } -static int osc_brw (int cmd,struct obd_export *exp,struct obd_info *oinfo, -u32 page_count,struct brw_page *pga, -struct obd_trans_info *oti) -{ -struct obdo *saved_oa =NULL ; -struct brw_page **ppga, **orig; -struct obd_import *imp =class_exp2cliimp (exp); -struct client_obd *cli; -int rc, page_count_orig; - -LASSERT ((imp !=NULL ) && (imp->imp_obd !=NULL )); - cli = &imp->imp_obd->u.cli; - -if (cmd &OBD_BRW_CHECK ) { -/* The caller just wants to know if there's a chance that this -* I/O can succeed */ - -if (imp->imp_invalid) -return -EIO ; -return 0 ; - } - -/* test_brw with a failed create can trip this, maybe others. */ -LASSERT (cli->cl_max_pages_per_rpc); - - rc =0 ; - - orig = ppga =osc_build_ppga (pga, page_count); -if (ppga ==NULL ) -return -ENOMEM ; - page_count_orig = page_count; - -sort_brw_pages (ppga, page_count); -while (page_count) { -u32 pages_per_brw; - -if (page_count > cli->cl_max_pages_per_rpc) - pages_per_brw = cli->cl_max_pages_per_rpc; -else - pages_per_brw = page_count; - - pages_per_brw =max_unfragmented_pages (ppga, pages_per_brw); - -if (saved_oa !=NULL ) { -/* restore previously saved oa */ - *oinfo->oi_oa = *saved_oa; - }else if (page_count > pages_per_brw) { -/* save a copy of oa (brw will clobber it) */ -OBDO_ALLOC (saved_oa); -if (saved_oa ==NULL ) -GOTO (out, rc = -ENOMEM ); - *saved_oa = *oinfo->oi_oa; - } - - rc =osc_brw_internal (cmd, exp, oinfo->oi_oa, oinfo->oi_md, - pages_per_brw, ppga, oinfo->oi_capa); - -if (rc !=0 ) -break ; - - page_count -= pages_per_brw; - ppga += pages_per_brw; - } - -out: -osc_release_ppga (orig, page_count_orig); - -if (saved_oa !=NULL ) -OBDO_FREE (saved_oa); - -return rc; -} -static int brw_interpret (const struct lu_env *env,struct ptlrpc_request *req,void *data,int rc) {
@@ -2267,17 +2059,6 @@ static int osc_set_data_with_check(struct lustre_handle *lockh,return set; } -static int osc_change_cbdata (struct obd_export *exp,struct lov_stripe_md *lsm, -ldlm_iterator_t replace,void *data) -{ -struct ldlm_res_id res_id; -struct obd_device *obd =class_exp2obd (exp); - -ostid_build_res_name (&lsm->lsm_oi, &res_id); -ldlm_resource_iterate (obd->obd_namespace, &res_id, replace, data); -return 0 ; -} -/* find any ldlm lock of the inode in osc * return 0 not find * 1 find one
@@ -2590,22 +2371,6 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,return rc; } -static int osc_enqueue (struct obd_export *exp,struct obd_info *oinfo, -struct ldlm_enqueue_info *einfo, -struct ptlrpc_request_set *rqset) -{ -struct ldlm_res_id res_id; -int rc; - -ostid_build_res_name (&oinfo->oi_md->lsm_oi, &res_id); - rc =osc_enqueue_base (exp, &res_id, &oinfo->oi_flags, &oinfo->oi_policy, - &oinfo->oi_md->lsm_oinfo[0 ]->loi_lvb, - oinfo->oi_md->lsm_oinfo[0 ]->loi_kms_valid, - oinfo->oi_cb_up, oinfo, einfo, oinfo->oi_lockh, - rqset, rqset !=NULL ,0 ); -return rc; -} - int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id, __u32 type, ldlm_policy_data_t *policy, __u32 mode, __u64 *flags, void *data, struct lustre_handle *lockh,
@@ -2659,28 +2424,6 @@ int osc_cancel_base(struct lustre_handle *lockh, __u32 mode)return 0 ; } -static int osc_cancel (struct obd_export *exp,struct lov_stripe_md *md, -__u32 mode,struct lustre_handle *lockh) -{ -return osc_cancel_base (lockh, mode); -} - -static int osc_cancel_unused (struct obd_export *exp, -struct lov_stripe_md *lsm, -ldlm_cancel_flags_t flags, -void *opaque) -{ -struct obd_device *obd =class_exp2obd (exp); -struct ldlm_res_id res_id, *resp =NULL ; - -if (lsm !=NULL ) { -ostid_build_res_name (&lsm->lsm_oi, &res_id); - resp = &res_id; - } - -return ldlm_cli_cancel_unused (obd->obd_namespace, resp, flags, opaque); -} -static int osc_statfs_interpret (const struct lu_env *env,struct ptlrpc_request *req,struct osc_async_args *aa,int rc)
@@ -3589,14 +3332,7 @@ struct obd_ops osc_obd_ops = { .o_getattr_async = osc_getattr_async, .o_setattr = osc_setattr, .o_setattr_async = osc_setattr_async, - .o_brw = osc_brw, - .o_punch = osc_punch, - .o_sync = osc_sync, - .o_enqueue = osc_enqueue, - .o_change_cbdata = osc_change_cbdata, .o_find_cbdata = osc_find_cbdata, - .o_cancel = osc_cancel, - .o_cancel_unused = osc_cancel_unused, .o_iocontrol = osc_iocontrol, .o_get_info = osc_get_info, .o_set_info_async = osc_set_info_async,
Signature · 1 line
1.7.9.5
PATCH 3/12 staging/lustre/osc: remove obsolete llog handling code
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
In osc_request.c there is no reason to handle any llog contexts since they are never setup. Remove the functions unused function osc_llog_init() and the obsolete function osc_llog_finish(). Remove the llog cleanup code in osc_disconnect() and osc_precleanup().
--- drivers/staging/lustre/lustre/osc/osc_request.c | 47 +---------------------- 1 file changed, 1 insertion(+), 46 deletions(-)
drivers/staging/lustre/lustre/osc/osc_request.c +1 -46
@@ -47,10 +47,10 @@#include "../include/lustre_ha.h" #include "../include/lprocfs_status.h" -#include "../include/lustre_log.h" #include "../include/lustre_debug.h" #include "../include/lustre_param.h" #include "../include/lustre_fid.h" +#include "../include/obd_class.h" #include "osc_internal.h" #include "osc_cl_internal.h"
@@ -2961,32 +2961,6 @@ static int osc_set_info_async(const struct lu_env *env, struct obd_export *exp,return 0 ; } - -static int osc_llog_init (struct obd_device *obd,struct obd_llog_group *olg, -struct obd_device *disk_obd,int *index) -{ -/* this code is not supposed to be used with LOD/OSP -* to be removed soon */ -LBUG (); -return 0 ; -} - -static int osc_llog_finish (struct obd_device *obd,int count) -{ -struct llog_ctxt *ctxt; - - ctxt =llog_get_context (obd,LLOG_MDS_OST_ORIG_CTXT ); -if (ctxt) { -llog_cat_close (NULL , ctxt->loc_handle); -llog_cleanup (NULL , ctxt); - } - - ctxt =llog_get_context (obd,LLOG_SIZE_REPL_CTXT ); -if (ctxt) -llog_cleanup (NULL , ctxt); -return 0 ; -} - static int osc_reconnect(const struct lu_env *env, struct obd_export *exp, struct obd_device *obd, struct obd_uuid *cluuid,
@@ -3016,22 +2990,8 @@ static int osc_reconnect(const struct lu_env *env,static int osc_disconnect (struct obd_export *exp) {struct obd_device *obd =class_exp2obd (exp); -struct llog_ctxt *ctxt;int rc; - ctxt =llog_get_context (obd,LLOG_SIZE_REPL_CTXT ); -if (ctxt) { -if (obd->u.cli.cl_conn_count ==1 ) { -/* Flush any remaining cancel messages out to the -* target */ -llog_sync (ctxt, exp,0 ); - } -llog_ctxt_put (ctxt); - }else { -CDEBUG (D_HA ,"No LLOG_SIZE_REPL_CTXT found in obd %p\n" , - obd); - } - rc =client_disconnect_export (exp);/** * Initially we put del_shrink_grant before disconnect_export, but it
@@ -3254,9 +3214,6 @@ static int osc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)obd_cleanup_client_import (obd);ptlrpc_lprocfs_unregister_obd (obd);lprocfs_obd_cleanup (obd); - rc =obd_llog_finish (obd,0 ); -if (rc !=0 ) -CERROR ("failed to cleanup llogging subsystems\n" );break ; } }
@@ -3337,8 +3294,6 @@ struct obd_ops osc_obd_ops = { .o_get_info = osc_get_info, .o_set_info_async = osc_set_info_async, .o_import_event = osc_import_event, - .o_llog_init = osc_llog_init, - .o_llog_finish = osc_llog_finish, .o_process_config = osc_process_config, .o_quotactl = osc_quotactl, .o_quotacheck = osc_quotacheck,
Signature · 1 line
1.7.9.5
PATCH 4/12 staging/lustre: remove obd_ost.h
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
Move the structures defined in lustre/include/obd_ost.h to the one file that uses them (lustre/osc/osc_request.c). Remove the unused function osc_update_enqueue(). Remove the then empty header lustre/include/obd_ost.h.
--- .../staging/lustre/lustre/include/lustre_lite.h | 1 - drivers/staging/lustre/lustre/include/lustre_log.h | 1 - drivers/staging/lustre/lustre/include/obd_ost.h | 100 -------------------- drivers/staging/lustre/lustre/lov/lov_obd.c | 1 - drivers/staging/lustre/lustre/lov/lov_request.c | 1 - drivers/staging/lustre/lustre/obdclass/debug.c | 1 - drivers/staging/lustre/lustre/obdclass/genops.c | 1 - .../staging/lustre/lustre/osc/osc_cl_internal.h | 1 - drivers/staging/lustre/lustre/osc/osc_quota.c | 2 +- drivers/staging/lustre/lustre/osc/osc_request.c | 90 +++++++++--------- drivers/staging/lustre/lustre/ptlrpc/recover.c | 1 - 11 files changed, 44 insertions(+), 156 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/obd_ost.h
drivers/staging/lustre/lustre/include/lustre_lite.h +0 -1
@@ -45,7 +45,6 @@#include "linux/lustre_lite.h" #include "obd_class.h" -#include "obd_ost.h" #include "lustre_net.h" #include "lustre_mds.h" #include "lustre_ha.h"
drivers/staging/lustre/lustre/include/lustre_log.h +0 -1
@@ -57,7 +57,6 @@*/ #include "obd_class.h" -#include "obd_ost.h" #include "lustre/lustre_idl.h" #include "dt_object.h"
drivers/staging/lustre/lustre/include/obd_ost.h deleted +0 -100
100 lines not on this page · raw message
drivers/staging/lustre/lustre/lov/lov_obd.c +0 -1
@@ -51,7 +51,6 @@#include "../include/lustre_dlm.h" #include "../include/lustre_mds.h" #include "../include/obd_class.h" -#include "../include/obd_ost.h" #include "../include/lprocfs_status.h" #include "../include/lustre_param.h" #include "../include/cl_object.h"
drivers/staging/lustre/lustre/lov/lov_request.c +0 -1
@@ -39,7 +39,6 @@#include "../../include/linux/libcfs/libcfs.h" #include "../include/obd_class.h" -#include "../include/obd_ost.h" #include "../include/lustre/lustre_idl.h" #include "lov_internal.h"
drivers/staging/lustre/lustre/obdclass/debug.c +0 -1
@@ -41,7 +41,6 @@#define DEBUG_SUBSYSTEM D_OTHER -#include "../include/obd_ost.h" #include "../include/obd_support.h" #include "../include/lustre_debug.h" #include "../include/lustre_net.h"
drivers/staging/lustre/lustre/obdclass/genops.c +0 -1
@@ -40,7 +40,6 @@*/ #define DEBUG_SUBSYSTEM S_CLASS -#include "../include/obd_ost.h" #include "../include/obd_class.h" #include "../include/lprocfs_status.h"
drivers/staging/lustre/lustre/osc/osc_cl_internal.h +0 -1
@@ -50,7 +50,6 @@#include "../include/obd.h" /* osc_build_res_name() */ -#include "../include/obd_ost.h" #include "../include/cl_object.h" #include "../include/lclient.h" #include "osc_internal.h"
drivers/staging/lustre/lustre/osc/osc_quota.c +1 -1
@@ -28,7 +28,7 @@* Code originally extracted from quota directory */ -#include "../include/obd_ost.h" +#include "../include/obd_class.h" #include "osc_internal.h" static inline struct osc_quota_info *osc_oqi_alloc (u32 id)
drivers/staging/lustre/lustre/osc/osc_request.c +43 -47
120 lines not on this page · raw message
drivers/staging/lustre/lustre/ptlrpc/recover.c +0 -1
@@ -47,7 +47,6 @@#include "../include/lustre_import.h" #include "../include/lustre_export.h" #include "../include/obd.h" -#include "../include/obd_ost.h" #include "../include/obd_class.h" #include <linux/list.h>
Signature · 1 line
1.7.9.5
PATCH 5/12 staging/lustre/mdc: remove unused OBD methods
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
Remove the unused OBD device methods mdc_pin() and mdc_unpin().
--- drivers/staging/lustre/lustre/mdc/mdc_request.c | 90 ----------------------- 1 file changed, 90 deletions(-)
drivers/staging/lustre/lustre/mdc/mdc_request.c +0 -90
@@ -2263,94 +2263,6 @@ int mdc_get_info(const struct lu_env *env, struct obd_export *exp,return rc; } -static int mdc_pin (struct obd_export *exp,const struct lu_fid *fid, -struct obd_capa *oc,struct obd_client_handle *handle, -int flags) -{ -struct ptlrpc_request *req; -struct mdt_body *body; -int rc; - - req =ptlrpc_request_alloc (class_exp2cliimp (exp), &RQF_MDS_PIN ); -if (req ==NULL ) -return -ENOMEM ; - -mdc_set_capa_size (req, &RMF_CAPA1 , oc); - - rc =ptlrpc_request_pack (req,LUSTRE_MDS_VERSION ,MDS_PIN ); -if (rc) { -ptlrpc_request_free (req); -return rc; - } - -mdc_pack_body (req, fid, oc,0 ,0 ,-1 , flags); - -ptlrpc_request_set_replen (req); - -mdc_get_rpc_lock (exp->exp_obd->u.cli.cl_rpc_lock,NULL ); - rc =ptlrpc_queue_wait (req); -mdc_put_rpc_lock (exp->exp_obd->u.cli.cl_rpc_lock,NULL ); -if (rc) { -CERROR ("Pin failed: %d\n" , rc); - goto err_out; - } - - body =req_capsule_server_get (&req->rq_pill, &RMF_MDT_BODY ); -if (body ==NULL ) { - rc = -EPROTO ; - goto err_out; - } - - handle->och_fh = body->handle; - handle->och_magic =OBD_CLIENT_HANDLE_MAGIC ; - - handle->och_mod =obd_mod_alloc (); -if (handle->och_mod ==NULL ) { -DEBUG_REQ (D_ERROR , req,"can't allocate md_open_data" ); - rc = -ENOMEM ; - goto err_out; - } - handle->och_mod->mod_open_req = req;/* will be dropped by unpin */ - -return 0 ; - -err_out: -ptlrpc_req_finished (req); -return rc; -} - -static int mdc_unpin (struct obd_export *exp,struct obd_client_handle *handle, -int flag) -{ -struct ptlrpc_request *req; -struct mdt_body *body; -int rc; - - req =ptlrpc_request_alloc_pack (class_exp2cliimp (exp), &RQF_MDS_UNPIN , -LUSTRE_MDS_VERSION ,MDS_UNPIN ); -if (req ==NULL ) -return -ENOMEM ; - - body =req_capsule_client_get (&req->rq_pill, &RMF_MDT_BODY ); - body->handle = handle->och_fh; - body->flags = flag; - -ptlrpc_request_set_replen (req); - -mdc_get_rpc_lock (exp->exp_obd->u.cli.cl_rpc_lock,NULL ); - rc =ptlrpc_queue_wait (req); -mdc_put_rpc_lock (exp->exp_obd->u.cli.cl_rpc_lock,NULL ); - -if (rc !=0 ) -CERROR ("Unpin failed: %d\n" , rc); - -ptlrpc_req_finished (req); -ptlrpc_req_finished (handle->och_mod->mod_open_req); - -obd_mod_put (handle->och_mod); -return rc; -} -int mdc_sync (struct obd_export *exp,const struct lu_fid *fid,struct obd_capa *oc,struct ptlrpc_request **request) {
@@ -2756,8 +2668,6 @@ struct obd_ops mdc_obd_ops = { .o_iocontrol = mdc_iocontrol, .o_set_info_async = mdc_set_info_async, .o_statfs = mdc_statfs, - .o_pin = mdc_pin, - .o_unpin = mdc_unpin, .o_fid_init = client_fid_init, .o_fid_fini = client_fid_fini, .o_fid_alloc = mdc_fid_alloc,
Signature · 1 line
1.7.9.5
PATCH 6/12 staging/lustre/mdc: inline llog methods
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
In mdc_setup() and mdc_precleanup() call mdc_llog_init() and mdc_llog_finish() directly rather than through the OBD method wrappers obd_llog_init() and obd_llod_finish(). Simplify the prototypes of mdc_llog_init() and mdc_llog_finish() according to their uses.
--- drivers/staging/lustre/lustre/mdc/mdc_request.c | 67 ++++++++++------------- 1 file changed, 29 insertions(+), 38 deletions(-)
drivers/staging/lustre/lustre/mdc/mdc_request.c +29 -38
@@ -2394,6 +2394,33 @@ struct ldlm_valblock_ops inode_lvbo = { .lvbo_free = mdc_resource_inode_free, }; +static int mdc_llog_init (struct obd_device *obd) +{ +struct obd_llog_group *olg = &obd->obd_olg; +struct llog_ctxt *ctxt; +int rc; + + rc =llog_setup (NULL , obd, olg,LLOG_CHANGELOG_REPL_CTXT , obd, + &llog_client_ops); +if (rc) +return rc; + + ctxt =llog_group_get_ctxt (olg,LLOG_CHANGELOG_REPL_CTXT ); +llog_initiator_connect (ctxt); +llog_ctxt_put (ctxt); + +return 0 ; +} + +static void mdc_llog_finish (struct obd_device *obd) +{ +struct llog_ctxt *ctxt; + + ctxt =llog_get_context (obd,LLOG_CHANGELOG_REPL_CTXT ); +if (ctxt) +llog_cleanup (NULL , ctxt); +} +static int mdc_setup (struct obd_device *obd,struct lustre_cfg *cfg) {struct client_obd *cli = &obd->u.cli;
@@ -2426,7 +2453,7 @@ static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg) obd->obd_namespace->ns_lvbo = &inode_lvbo; - rc =obd_llog_init (obd, &obd->obd_olg, obd,NULL ); + rc =mdc_llog_init (obd);if (rc) {mdc_cleanup (obd);CERROR ("failed to setup llogging subsystems\n" );
@@ -2487,9 +2514,7 @@ static int mdc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)ptlrpc_lprocfs_unregister_obd (obd);lprocfs_obd_cleanup (obd); - rc =obd_llog_finish (obd,0 ); -if (rc !=0 ) -CERROR ("failed to cleanup llogging subsystems\n" ); +mdc_llog_finish (obd);break ; }return rc;
@@ -2507,38 +2532,6 @@ static int mdc_cleanup(struct obd_device *obd)return client_obd_cleanup (obd); } - -static int mdc_llog_init (struct obd_device *obd,struct obd_llog_group *olg, -struct obd_device *tgt,int *index) -{ -struct llog_ctxt *ctxt; -int rc; - -LASSERT (olg == &obd->obd_olg); - - rc =llog_setup (NULL , obd, olg,LLOG_CHANGELOG_REPL_CTXT , tgt, - &llog_client_ops); -if (rc) -return rc; - - ctxt =llog_group_get_ctxt (olg,LLOG_CHANGELOG_REPL_CTXT ); -llog_initiator_connect (ctxt); -llog_ctxt_put (ctxt); - -return 0 ; -} - -static int mdc_llog_finish (struct obd_device *obd,int count) -{ -struct llog_ctxt *ctxt; - - ctxt =llog_get_context (obd,LLOG_CHANGELOG_REPL_CTXT ); -if (ctxt) -llog_cleanup (NULL , ctxt); - -return 0 ; -} -static int mdc_process_config (struct obd_device *obd,u32 len,void *buf) {struct lustre_cfg *lcfg = buf;
@@ -2672,8 +2665,6 @@ struct obd_ops mdc_obd_ops = { .o_fid_fini = client_fid_fini, .o_fid_alloc = mdc_fid_alloc, .o_import_event = mdc_import_event, - .o_llog_init = mdc_llog_init, - .o_llog_finish = mdc_llog_finish, .o_get_info = mdc_get_info, .o_process_config = mdc_process_config, .o_get_uuid = mdc_get_uuid,
Signature · 1 line
1.7.9.5
PATCH 7/12 staging/lustre/mgc: inline mgc_cancel()
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
The function mgc_cancel() is never invoked as an OBD device method and is only called directly from mgc_process_log() so remove it.
--- drivers/staging/lustre/lustre/mgc/mgc_request.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/staging/lustre/lustre/mgc/mgc_request.c +2 -15
@@ -904,14 +904,6 @@ static int mgc_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,return rc; } -static int mgc_cancel (struct obd_export *exp,struct lov_stripe_md *md, -__u32 mode,struct lustre_handle *lockh) -{ -ldlm_lock_decref (lockh, mode); - -return 0 ; -} -static void mgc_notify_active (struct obd_device *unused) {/* wakeup mgc_requeue_thread to requeue mgc lock */
@@ -1679,12 +1671,8 @@ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld)mutex_unlock (&cld->cld_lock);/* Now drop the lock so MGS can revoke it */ -if (!rcl) { - rcl =mgc_cancel (mgc->u.cli.cl_mgc_mgsexp,NULL , -LCK_CR , &lockh); -if (rcl) -CERROR ("Can't drop cfg lock: %d\n" , rcl); - } +if (!rcl) +ldlm_lock_decref (&lockh,LCK_CR );return rc; }
@@ -1814,7 +1802,6 @@ struct obd_ops mgc_obd_ops = { .o_connect = client_connect_import, .o_disconnect = client_disconnect_export,/* .o_enqueue = mgc_enqueue, */ - .o_cancel = mgc_cancel,/* .o_iocontrol = mgc_iocontrol, */ .o_set_info_async = mgc_set_info_async, .o_get_info = mgc_get_info,
Signature · 1 line
1.7.9.5
PATCH 8/12 staging/lustre: remove unused OBD methods
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
Remove the unused OBD device methods:
obd_brw()
obd_cancel()
obd_cancel_unused()
obd_change_cbdata()
obd_create_async()
obd_enqueue()
obd_enqueue_rqset()
obd_extent_calc()
obd_llog_connect()
obd_llog_finish()
obd_llog_init()
obd_merge_lvb()
obd_pin()
obd_pin_observer()
obd_ping()
obd_precreate()
obd_punch()
obd_punch_rqset()
obd_sync()
obd_sync_rqset()
obd_unpin()
obd_unpin_observer()--- drivers/staging/lustre/lustre/include/lustre_log.h | 5 - drivers/staging/lustre/lustre/include/obd.h | 47 ---- drivers/staging/lustre/lustre/include/obd_class.h | 279 -------------------- drivers/staging/lustre/lustre/obdclass/llog_obd.c | 25 -- .../lustre/lustre/obdclass/lprocfs_status.c | 20 -- 5 files changed, 376 deletions(-)
drivers/staging/lustre/lustre/include/lustre_log.h +0 -5
@@ -206,11 +206,6 @@ int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp, int flags);int llog_cancel (const struct lu_env *env,struct llog_ctxt *ctxt,struct llog_cookie *cookies,int flags); -int obd_llog_init (struct obd_device *obd,struct obd_llog_group *olg, -struct obd_device *disk_obd,int *idx); - -int obd_llog_finish (struct obd_device *obd,int count); -/* llog_ioctl.c */ int llog_ioctl (const struct lu_env *env,struct llog_ctxt *ctxt,int cmd,struct obd_ioctl_data *data);
drivers/staging/lustre/lustre/include/obd.h +0 -47
82 lines not on this page · raw message
drivers/staging/lustre/lustre/include/obd_class.h +0 -279
333 lines not on this page · raw message
drivers/staging/lustre/lustre/obdclass/llog_obd.c +0 -25
@@ -242,31 +242,6 @@ int llog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt, }EXPORT_SYMBOL (llog_cancel); -int obd_llog_init (struct obd_device *obd,struct obd_llog_group *olg, -struct obd_device *disk_obd,int *index) -{ -int rc; - -OBD_CHECK_DT_OP (obd, llog_init,0 ); -OBD_COUNTER_INCREMENT (obd, llog_init); - - rc =OBP (obd, llog_init)(obd, olg, disk_obd, index); -return rc; -} -EXPORT_SYMBOL (obd_llog_init); - -int obd_llog_finish (struct obd_device *obd,int count) -{ -int rc; - -OBD_CHECK_DT_OP (obd, llog_finish,0 ); -OBD_COUNTER_INCREMENT (obd, llog_finish); - - rc =OBP (obd, llog_finish)(obd, count); -return rc; -} -EXPORT_SYMBOL (obd_llog_finish); -/* context key constructor/destructor: llog_key_init, llog_key_fini */ LU_KEY_INIT_FINI(llog, struct llog_thread_info);/* context key: llog_thread_key */
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c +0 -20
@@ -1309,44 +1309,24 @@ void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats)LPROCFS_OBD_OP_INIT (num_private_stats, stats, packmd);LPROCFS_OBD_OP_INIT (num_private_stats, stats, unpackmd);LPROCFS_OBD_OP_INIT (num_private_stats, stats, preallocate); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, precreate);LPROCFS_OBD_OP_INIT (num_private_stats, stats, create); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, create_async);LPROCFS_OBD_OP_INIT (num_private_stats, stats, destroy);LPROCFS_OBD_OP_INIT (num_private_stats, stats, setattr);LPROCFS_OBD_OP_INIT (num_private_stats, stats, setattr_async);LPROCFS_OBD_OP_INIT (num_private_stats, stats, getattr);LPROCFS_OBD_OP_INIT (num_private_stats, stats, getattr_async); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, brw); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, merge_lvb);LPROCFS_OBD_OP_INIT (num_private_stats, stats, adjust_kms); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, punch); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, sync); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, migrate); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, copy); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, iterate);LPROCFS_OBD_OP_INIT (num_private_stats, stats, preprw);LPROCFS_OBD_OP_INIT (num_private_stats, stats, commitrw); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, enqueue); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, change_cbdata);LPROCFS_OBD_OP_INIT (num_private_stats, stats, find_cbdata); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, cancel); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, cancel_unused);LPROCFS_OBD_OP_INIT (num_private_stats, stats, init_export);LPROCFS_OBD_OP_INIT (num_private_stats, stats, destroy_export); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, extent_calc); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, llog_init); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, llog_connect); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, llog_finish); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, pin); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, unpin);LPROCFS_OBD_OP_INIT (num_private_stats, stats, import_event);LPROCFS_OBD_OP_INIT (num_private_stats, stats, notify);LPROCFS_OBD_OP_INIT (num_private_stats, stats, health_check);LPROCFS_OBD_OP_INIT (num_private_stats, stats, get_uuid);LPROCFS_OBD_OP_INIT (num_private_stats, stats, quotacheck);LPROCFS_OBD_OP_INIT (num_private_stats, stats, quotactl); -LPROCFS_OBD_OP_INIT (num_private_stats, stats, ping);LPROCFS_OBD_OP_INIT (num_private_stats, stats, pool_new);LPROCFS_OBD_OP_INIT (num_private_stats, stats, pool_rem);LPROCFS_OBD_OP_INIT (num_private_stats, stats, pool_add);
Signature · 1 line
1.7.9.5
PATCH 9/12 staging/lustre/mgc: remove server specific llog handling
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
In mgc_process_cfg_log() remove code to handle LLOG_CONFIG_ORIG_CTXT. This context is not setup on clients.
--- drivers/staging/lustre/lustre/mgc/mgc_request.c | 84 ++--------------------- 1 file changed, 4 insertions(+), 80 deletions(-)
drivers/staging/lustre/lustre/mgc/mgc_request.c +4 -80
@@ -1461,54 +1461,11 @@ out:return rc; } -static int mgc_llog_local_copy (const struct lu_env *env, -struct obd_device *obd, -struct llog_ctxt *rctxt, -struct llog_ctxt *lctxt,char *logname) -{ -char *temp_log; -int rc; - - - -/* -* - copy it to backup using llog_backup() -* - copy remote llog to logname using llog_backup() -* - if failed then move backup to logname again -*/ - -OBD_ALLOC (temp_log,strlen (logname) +1 ); -if (!temp_log) -return -ENOMEM ; -sprintf (temp_log,"%sT" , logname); - -/* make a copy of local llog at first */ - rc =llog_backup (env, obd, lctxt, lctxt, logname, temp_log); -if (rc <0 && rc != -ENOENT ) - goto out; -/* copy remote llog to the local copy */ - rc =llog_backup (env, obd, rctxt, lctxt, logname, logname); -if (rc == -ENOENT ) { -/* no remote llog, delete local one too */ -llog_erase (env, lctxt,NULL , logname); - }else if (rc <0 ) { -/* error during backup, get local one back from the copy */ -llog_backup (env, obd, lctxt, lctxt, temp_log, logname); -out: -CERROR ("%s: failed to copy remote log %s: rc = %d\n" , - obd->obd_name, logname, rc); - } -llog_erase (env, lctxt,NULL , temp_log); -OBD_FREE (temp_log,strlen (logname) +1 ); -return rc; -} -/* local_only means it cannot get remote llogs */ static int mgc_process_cfg_log (struct obd_device *mgc,struct config_llog_data *cld,int local_only) { -struct llog_ctxt *ctxt, *lctxt =NULL ; -struct dt_object *cl_mgc_dir = mgc->u.cli.cl_mgc_configs_dir; +struct llog_ctxt *ctxt;struct lustre_sb_info *lsi =NULL ;int rc =0 ;bool sptlrpc_started = false;
@@ -1538,40 +1495,9 @@ static int mgc_process_cfg_log(struct obd_device *mgc, ctxt =llog_get_context (mgc,LLOG_CONFIG_REPL_CTXT );LASSERT (ctxt); - lctxt =llog_get_context (mgc,LLOG_CONFIG_ORIG_CTXT ); - -/* Copy the setup log locally if we can. Don't mess around if we're -* running an MGS though (logs are already local). */ -if (lctxt && lsi &&IS_SERVER (lsi) && !IS_MGS (lsi) && - cl_mgc_dir !=NULL && -lu2dt_dev (cl_mgc_dir->do_lu.lo_dev) == lsi->lsi_dt_dev) { -if (!local_only) -/* Only try to copy log if we have the lock. */ - rc =mgc_llog_local_copy (env, mgc, ctxt, lctxt, - cld->cld_logname); -if (local_only || rc) { -if (llog_is_empty (env, lctxt, cld->cld_logname)) { -LCONSOLE_ERROR_MSG (0x13a , -"Failed to get MGS log %s and no local copy.\n" , - cld->cld_logname); - rc = -ENOENT ; - goto out_pop; - } -CDEBUG (D_MGC , -"Failed to get MGS log %s, using local copy for now, will try to update later.\n" , - cld->cld_logname); - } -/* Now, whether we copied or not, start using the local llog. -* If we failed to copy, we'll start using whatever the old -* log has. */ -llog_ctxt_put (ctxt); - ctxt = lctxt; - lctxt =NULL ; - }else { -if (local_only)/* no local log at client side */ { - rc = -EIO ; - goto out_pop; - } +if (local_only)/* no local log at client side */ { + rc = -EIO ; + goto out_pop; }if (cld_is_sptlrpc (cld)) {
@@ -1587,8 +1513,6 @@ static int mgc_process_cfg_log(struct obd_device *mgc, out_pop:__llog_ctxt_put (env, ctxt); -if (lctxt) -__llog_ctxt_put (env, lctxt);/* * update settings on existing OBDs. doing it inside
Signature · 1 line
1.7.9.5
PATCH 10/12 staging/lustre/ptlrpc: remove sptlrpc_conf_target_get_rules()
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
Remove the unused function sptlrpc_conf_target_get_rules() and its supporting functions.
--- drivers/staging/lustre/lustre/include/lustre_sec.h | 3 - drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 327 -------------------- 2 files changed, 330 deletions(-)
drivers/staging/lustre/lustre/include/lustre_sec.h +0 -3
@@ -347,9 +347,6 @@ void sptlrpc_conf_log_stop(const char *logname);void sptlrpc_conf_log_update_begin (const char *logname);void sptlrpc_conf_log_update_end (const char *logname);void sptlrpc_conf_client_adapt (struct obd_device *obd); -int sptlrpc_conf_target_get_rules (struct obd_device *obd, -struct sptlrpc_rule_set *rset, -int initial); void sptlrpc_target_choose_flavor(struct sptlrpc_rule_set *rset, enum lustre_sec_part from, lnet_nid_t nid,
drivers/staging/lustre/lustre/ptlrpc/sec_config.c +0 -327
347 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 11/12 staging/lustre/obdclass: remove llog_ioctl.c
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
Remove the unused function llog_ioctl() and the file lustre/obdclass/llog_ioctl.c.
--- drivers/staging/lustre/lustre/include/lustre_log.h | 4 - drivers/staging/lustre/lustre/obdclass/Makefile | 2 +- .../staging/lustre/lustre/obdclass/llog_ioctl.c | 418 -------------------- 3 files changed, 1 insertion(+), 423 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_ioctl.c
drivers/staging/lustre/lustre/include/lustre_log.h +0 -4
@@ -206,10 +206,6 @@ int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp, int flags);int llog_cancel (const struct lu_env *env,struct llog_ctxt *ctxt,struct llog_cookie *cookies,int flags); -/* llog_ioctl.c */ -int llog_ioctl (const struct lu_env *env,struct llog_ctxt *ctxt,int cmd, -struct obd_ioctl_data *data); -/* llog_net.c */ int llog_initiator_connect (struct llog_ctxt *ctxt);
drivers/staging/lustre/lustre/obdclass/Makefile +1 -1
@@ -2,7 +2,7 @@ obj-$(CONFIG_LUSTRE_FS) += obdclass.o obdclass-y := linux/linux-module.o linux/linux-obdo.o linux/linux-sysctl.o \ llog.o llog_cat.o llog_obd.o llog_swab.o class_obd.o debug.o \ - genops.o uuid.o llog_ioctl.o lprocfs_status.o \ + genops.o uuid.o lprocfs_status.o \ lustre_handles.o lustre_peer.o \ local_storage.o statfs_pack.o obdo.o obd_config.o obd_mount.o\ lu_object.o dt_object.o capa.o cl_object.o \
drivers/staging/lustre/lustre/obdclass/llog_ioctl.c deleted +0 -418
418 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 12/12 staging/lustre/obdclass: remove local_storage.[ch]
In reply to John L. HammondFrom: "John L. Hammond" <[email protected]>
Remove the unused files lustre/obdclass/local_storage.[ch].
--- drivers/staging/lustre/lustre/obdclass/Makefile | 2 +- .../staging/lustre/lustre/obdclass/local_storage.c | 894 -------------------- .../staging/lustre/lustre/obdclass/local_storage.h | 91 -- 3 files changed, 1 insertion(+), 986 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.h
drivers/staging/lustre/lustre/obdclass/Makefile +1 -1
@@ -4,6 +4,6 @@ obdclass-y := linux/linux-module.o linux/linux-obdo.o linux/linux-sysctl.o \ llog.o llog_cat.o llog_obd.o llog_swab.o class_obd.o debug.o \ genops.o uuid.o lprocfs_status.o \ lustre_handles.o lustre_peer.o \ - local_storage.o statfs_pack.o obdo.o obd_config.o obd_mount.o\ + statfs_pack.o obdo.o obd_config.o obd_mount.o \ lu_object.o dt_object.o capa.o cl_object.o \ cl_page.o cl_lock.o cl_io.o lu_ref.o acl.o
drivers/staging/lustre/lustre/obdclass/local_storage.c deleted +0 -894
894 lines not on this page · raw message
drivers/staging/lustre/lustre/obdclass/local_storage.h deleted +0 -91
91 lines not on this page · raw message
Signature · 1 line
1.7.9.5