Lustre: get rid of is_osp_on_mdt
cover Lustre: get rid of is_osp_on_mdt
Hugues <[email protected]> has recently discovered a possibility of buffer underflow in is_osp_on_mdt.
Instead of fixing it up, let's just get rid of this function altogether, since it's no longer needed.
Mikhail Pershin (1):
staging/lustre: use osc_reply_portal for OUT services
Oleg Drokin (1):
staging/lustre: remove unused function is_osp_on_mdt
drivers/staging/lustre/lustre/fld/fld_request.c | 1 + .../lustre/lustre/include/lustre/lustre_idl.h | 2 +- drivers/staging/lustre/lustre/include/obd.h | 29 ---------------------- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 29 ++++++++++++++-------- 4 files changed, 20 insertions(+), 41 deletions(-)
Signature · 1 line
1.9.3
PATCH 1/2 staging/lustre: use osc_reply_portal for OUT services
From: Mikhail Pershin <[email protected]>
OUT service is used to server both MDS-MDS updates and MDS-OST therefore services on MDT and OST are set to use the same request and reply portals to be fully unified and able to serve any type of requests.
Reviewed-on: http://review.whamcloud.com/8390
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3467
--- drivers/staging/lustre/lustre/fld/fld_request.c | 1 + .../lustre/lustre/include/lustre/lustre_idl.h | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 29 ++++++++++++++-------- 3 files changed, 20 insertions(+), 12 deletions(-)
drivers/staging/lustre/lustre/fld/fld_request.c +1 -0
@@ -426,6 +426,7 @@ int fld_client_rpc(struct obd_export *exp,ptlrpc_request_set_replen (req); req->rq_request_portal =FLD_REQUEST_PORTAL ; + req->rq_reply_portal =MDC_REPLY_PORTAL ;ptlrpc_at_set_req_timeout (req); if (fld_op == FLD_LOOKUP &&
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +1 -1
@@ -128,7 +128,7 @@//#define PTLBD_BULK_PORTAL 21 #define MDS_SETATTR_PORTAL 22#define MDS_READPAGE_PORTAL 23 -#define MDS_MDS_PORTAL 24 +#define OUT_PORTAL 24#define MGC_REPLY_PORTAL 25#define MGS_REQUEST_PORTAL 26
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c +18 -11
@@ -267,15 +267,10 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)char *name = obddev->obd_type->typ_name;ldlm_ns_type_t ns_type =LDLM_NS_TYPE_UNKNOWN ;int rc; -char *cli_name =lustre_cfg_buf (lcfg,0 );/* In a more perfect world, we would hang a ptlrpc_client off of * obd_type and just use the values from there. */ -if (!strcmp (name,LUSTRE_OSC_NAME ) || - (!(strcmp (name,LUSTRE_OSP_NAME )) && - (is_osp_on_mdt (cli_name) && -strstr (lustre_cfg_buf (lcfg,1 ),"OST" ) !=NULL ))) { -/* OSC or OSP_on_MDT for OSTs */ +if (!strcmp (name,LUSTRE_OSC_NAME )) { rq_portal =OST_REQUEST_PORTAL ; rp_portal =OSC_REPLY_PORTAL ; connect_op =OST_CONNECT ;
@@ -283,17 +278,29 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg) cli->cl_sp_to =LUSTRE_SP_OST ; ns_type =LDLM_NS_TYPE_OSC ; }else if (!strcmp (name,LUSTRE_MDC_NAME ) || - !strcmp (name,LUSTRE_LWP_NAME ) || - (!strcmp (name,LUSTRE_OSP_NAME ) && - (is_osp_on_mdt (cli_name) && -strstr (lustre_cfg_buf (lcfg,1 ),"OST" ) ==NULL ))) { -/* MDC or OSP_on_MDT for other MDTs */ + !strcmp (name,LUSTRE_LWP_NAME )) { rq_portal =MDS_REQUEST_PORTAL ; rp_portal =MDC_REPLY_PORTAL ; connect_op =MDS_CONNECT ; cli->cl_sp_me =LUSTRE_SP_CLI ; cli->cl_sp_to =LUSTRE_SP_MDT ; ns_type =LDLM_NS_TYPE_MDC ; + }else if (!strcmp (name,LUSTRE_OSP_NAME )) { +if (strstr (lustre_cfg_buf (lcfg,1 ),"OST" ) ==NULL ) { +/* OSP_on_MDT for other MDTs */ + connect_op =MDS_CONNECT ; + cli->cl_sp_to =LUSTRE_SP_MDT ; + ns_type =LDLM_NS_TYPE_MDC ; + rq_portal =OUT_PORTAL ; + }else { +/* OSP on MDT for OST */ + connect_op =OST_CONNECT ; + cli->cl_sp_to =LUSTRE_SP_OST ; + ns_type =LDLM_NS_TYPE_OSC ; + rq_portal =OST_REQUEST_PORTAL ; + } + rp_portal =OSC_REPLY_PORTAL ; + cli->cl_sp_me =LUSTRE_SP_CLI ; }else if (!strcmp (name,LUSTRE_MGC_NAME )) { rq_portal =MGS_REQUEST_PORTAL ; rp_portal =MGC_REPLY_PORTAL ;
Signature · 1 line
1.9.3
PATCH 2/2 staging/lustre: remove unused function is_osp_on_mdt
In reply to Oleg DrokinThis function is no longer used anywhere.
--- drivers/staging/lustre/lustre/include/obd.h | 29 ----------------------------- 1 file changed, 29 deletions(-)
drivers/staging/lustre/lustre/include/obd.h +0 -29
@@ -660,35 +660,6 @@ struct niobuf_local {#define LUSTRE_MGS_OBDNAME "MGS"#define LUSTRE_MGC_OBDNAME "MGC" -static inline int is_osp_on_mdt (char *name) -{ -char *ptr; - - ptr =strrchr (name,'-' ); -if (ptr ==NULL ) { -CERROR ("%s is not a obdname\n" , name); -return 0 ; - } - -/* 1.8 OSC/OSP name on MDT is fsname-OSTxxxx-osc */ -if (strncmp (ptr +1 ,"osc" ,3 ) ==0 ) -return 1 ; - -if (strncmp (ptr +1 ,"MDT" ,3 ) !=0 ) -return 0 ; - -while (*(--ptr) !='-' && ptr != name); - -if (ptr == name) -return 0 ; - -if (strncmp (ptr +1 ,LUSTRE_OSP_NAME ,strlen (LUSTRE_OSP_NAME )) !=0 && -strncmp (ptr +1 ,LUSTRE_OSC_NAME ,strlen (LUSTRE_OSC_NAME )) !=0 ) -return 0 ; - -return 1 ; -} -/* Don't conflict with on-wire flags OBD_BRW_WRITE, etc */ #define N_LOCAL_TEMP_PAGE 0x10000000
Signature · 1 line
1.9.3