lustre: continues dead code removal
cover lustre: continues dead code removal
This series of patches continues removal of unused code in lustre client tree.
John L. Hammond (9):
staging/lustre/obdecho: remove #if 0-ed out regions staging/lustre/obdclass: remove idmap.c staging/lustre/obdclass: remove lu_ucred.c staging/lustre/obdclass: remove mea.c staging/lustre: remove md_object.h staging/lustre/mgc: remove server specific handlers staging/lustre/obdclass: remove llog_test.ko staging/lustre/obdclass: remove llog_osd.c staging/lustre/mdc: remove obsolete llog ioctl handlers
Oleg Drokin (2):
staging/lustre: Remove unused header libcfs_heap.h staging/lustre: remove unused som_attrs and hsm_attrs structures
Peng Tao (1):
staging/lustre/obdecho: remove metadata echo client
.../staging/lustre/include/linux/libcfs/libcfs.h | 1 - .../lustre/include/linux/libcfs/libcfs_heap.h | 200 --- drivers/staging/lustre/lustre/fid/lproc_fid.c | 1 - drivers/staging/lustre/lustre/fld/fld_cache.c | 1 - drivers/staging/lustre/lustre/fld/fld_request.c | 1 - drivers/staging/lustre/lustre/fld/lproc_fld.c | 1 - .../lustre/lustre/include/lustre/lustre_idl.h | 37 - .../staging/lustre/lustre/include/lustre_idmap.h | 104 -- drivers/staging/lustre/lustre/include/lustre_log.h | 9 - drivers/staging/lustre/lustre/include/lustre_net.h | 1 - drivers/staging/lustre/lustre/include/md_object.h | 899 -------------- drivers/staging/lustre/lustre/include/obd_class.h | 4 - drivers/staging/lustre/lustre/mdc/mdc_request.c | 15 - drivers/staging/lustre/lustre/mgc/mgc_request.c | 177 --- drivers/staging/lustre/lustre/obdclass/Makefile | 9 +- drivers/staging/lustre/lustre/obdclass/idmap.c | 477 -------- drivers/staging/lustre/lustre/obdclass/llog_osd.c | 1290 -------------------- drivers/staging/lustre/lustre/obdclass/llog_test.c | 1072 ---------------- drivers/staging/lustre/lustre/obdclass/lu_ucred.c | 107 -- drivers/staging/lustre/lustre/obdclass/mea.c | 112 -- .../staging/lustre/lustre/obdecho/echo_client.c | 1103 +---------------- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 48 - 22 files changed, 50 insertions(+), 5619 deletions(-) delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h delete mode 100644 drivers/staging/lustre/lustre/include/lustre_idmap.h delete mode 100644 drivers/staging/lustre/lustre/include/md_object.h delete mode 100644 drivers/staging/lustre/lustre/obdclass/idmap.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_osd.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_test.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ucred.c delete mode 100644 drivers/staging/lustre/lustre/obdclass/mea.c
Signature · 1 line
1.9.3
PATCH 1/12 staging/lustre: Remove unused header libcfs_heap.h
With removal of libcfs/heap.c, it's header can also go away now.
--- .../staging/lustre/include/linux/libcfs/libcfs.h | 1 - .../lustre/include/linux/libcfs/libcfs_heap.h | 200 --------------------- drivers/staging/lustre/lustre/include/lustre_net.h | 1 - 3 files changed, 202 deletions(-) delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h
drivers/staging/lustre/include/linux/libcfs/libcfs.h +0 -1
@@ -165,7 +165,6 @@ void cfs_get_random_bytes(void *buf, int size);#include "libcfs_kernelcomm.h" #include "libcfs_workitem.h" #include "libcfs_hash.h" -#include "libcfs_heap.h" #include "libcfs_fail.h" #include "libcfs_crypto.h"
drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h deleted +0 -200
200 lines not on this page · raw message
drivers/staging/lustre/lustre/include/lustre_net.h +0 -1
@@ -1204,7 +1204,6 @@ struct ptlrpc_nrs_request { unsigned nr_enqueued:1; unsigned nr_started:1; unsigned nr_finalized:1; -cfs_binheap_node_t nr_node;/** * Policy-specific fields, used for determining a request's scheduling
Signature · 1 line
1.9.3
PATCH 2/12 staging/lustre/obdecho: remove metadata echo client
In reply to Oleg DrokinFrom: Peng Tao <[email protected]>
The metadata echo client requires server support and should not have been included.
Reviewed-on: http://review.whamcloud.com/2674
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1330
--- .../staging/lustre/lustre/obdecho/echo_client.c | 1053 +------------------- 1 file changed, 46 insertions(+), 1007 deletions(-)
drivers/staging/lustre/lustre/obdecho/echo_client.c +46 -1007
@@ -43,7 +43,6 @@#include "../include/lustre_debug.h" #include "../include/lprocfs_status.h" #include "../include/cl_object.h" -#include "../include/md_object.h" #include "../include/lustre_fid.h" #include "../include/lustre_acl.h" #include "../include/lustre_net.h"
@@ -62,8 +61,6 @@ struct echo_device {struct cl_site *ed_site;struct lu_device *ed_next;int ed_next_islov; -int ed_next_ismd; -struct lu_client_seq *ed_cl_seq; };struct echo_object {
@@ -192,17 +189,6 @@ struct echo_thread_info {struct cl_lock_descr eti_descr;struct lu_fid eti_fid;struct lu_fid eti_fid2; -struct md_op_spec eti_spec; -struct lov_mds_md_v3 eti_lmm; -struct lov_user_md_v3 eti_lum; -struct md_attr eti_ma; -struct lu_name eti_lname; -/* per-thread values, can be re-used */ -void *eti_big_lmm; -int eti_big_lmmsize; -char eti_name[20 ]; -struct lu_buf eti_buf; -char eti_xattr_buf[LUSTRE_POSIX_ACL_MAX_SIZE ]; };/* No session used right now */
@@ -463,6 +449,8 @@ static int echo_object_init(const struct lu_env *env, struct lu_object *obj,struct echo_device *ed =cl2echo_dev (lu2cl_dev (obj->lo_dev));struct echo_client_obd *ec = ed->ed_ec;struct echo_object *eco =cl2echo_obj (lu2cl (obj)); +const struct cl_object_conf *cconf; +struct echo_object_conf *econf;if (ed->ed_next) {struct lu_object *below;
@@ -476,17 +464,13 @@ static int echo_object_init(const struct lu_env *env, struct lu_object *obj,lu_object_add (obj, below); } -if (!ed->ed_next_ismd) { -const struct cl_object_conf *cconf =lu2cl_conf (conf); -struct echo_object_conf *econf =cl2echo_conf (cconf); + cconf =lu2cl_conf (conf); + econf =cl2echo_conf (cconf); -LASSERT (econf->eoc_md); - eco->eo_lsm = *econf->eoc_md; -/* clear the lsm pointer so that it won't get freed. */ - *econf->eoc_md =NULL ; - }else { - eco->eo_lsm =NULL ; - } +LASSERT (econf->eoc_md); + eco->eo_lsm = *econf->eoc_md; +/* clear the lsm pointer so that it won't get freed. */ + *econf->eoc_md =NULL ; eco->eo_dev = ed;atomic_set (&eco->eo_npages,0 );
@@ -651,8 +635,7 @@ static int echo_site_init(const struct lu_env *env, struct echo_device *ed)static void echo_site_fini (const struct lu_env *env,struct echo_device *ed) {if (ed->ed_site) { -if (!ed->ed_next_ismd) -cl_site_fini (ed->ed_site); +cl_site_fini (ed->ed_site); ed->ed_site =NULL ; } }
@@ -719,53 +702,6 @@ static struct lu_context_key echo_session_key = {LU_TYPE_INIT_FINI (echo, &echo_thread_key, &echo_session_key); -#define ECHO_SEQ_WIDTH 0xffffffff -static int echo_fid_init (struct echo_device *ed,char *obd_name, -struct seq_server_site *ss) -{ -char *prefix; -int rc; - -OBD_ALLOC_PTR (ed->ed_cl_seq); -if (ed->ed_cl_seq ==NULL ) -return -ENOMEM ; - -OBD_ALLOC (prefix,MAX_OBD_NAME +5 ); -if (prefix ==NULL ) -GOTO (out_free_seq, rc = -ENOMEM ); - -snprintf (prefix,MAX_OBD_NAME +5 ,"srv-%s" , obd_name); - -/* Init client side sequence-manager */ - rc =seq_client_init (ed->ed_cl_seq,NULL , -LUSTRE_SEQ_METADATA , - prefix, ss->ss_server_seq); - ed->ed_cl_seq->lcs_width =ECHO_SEQ_WIDTH ; -OBD_FREE (prefix,MAX_OBD_NAME +5 ); -if (rc) -GOTO (out_free_seq, rc); - -return 0 ; - -out_free_seq: -OBD_FREE_PTR (ed->ed_cl_seq); - ed->ed_cl_seq =NULL ; -return rc; -} - -static int echo_fid_fini (struct obd_device *obddev) -{ -struct echo_device *ed =obd2echo_dev (obddev); - -if (ed->ed_cl_seq !=NULL ) { -seq_client_fini (ed->ed_cl_seq); -OBD_FREE_PTR (ed->ed_cl_seq); - ed->ed_cl_seq =NULL ; - } - -return 0 ; -} -static struct lu_device *echo_device_alloc (const struct lu_env *env,struct lu_device_type *t,struct lustre_cfg *cfg)
@@ -806,13 +742,14 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env, next = tgt->obd_lu_dev;if (!strcmp (tgt->obd_type->typ_name,LUSTRE_MDT_NAME )) { - ed->ed_next_ismd =1 ; - }else { - ed->ed_next_ismd =0 ; - rc =echo_site_init (env, ed); -if (rc) -GOTO (out, rc); +CERROR ("echo MDT client must be run on server\n" ); +GOTO (out, rc = -EOPNOTSUPP ); } + + rc =echo_site_init (env, ed); +if (rc) +GOTO (out, rc); + cleanup =3 ; rc =echo_client_setup (env, obd, cfg);
@@ -822,82 +759,34 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env, ed->ed_ec = &obd->u.echo_client; cleanup =4 ; -if (ed->ed_next_ismd) { -/* Suppose to connect to some Metadata layer */ -struct lu_site *ls; -struct lu_device *ld; -int found =0 ; - -if (next ==NULL ) { -CERROR ("%s is not lu device type!\n" , -lustre_cfg_string (cfg,1 )); -GOTO (out, rc = -EINVAL ); - } - - tgt_type_name =lustre_cfg_string (cfg,2 ); -if (!tgt_type_name) { -CERROR ("%s no type name for echo %s setup\n" , -lustre_cfg_string (cfg,1 ), - tgt->obd_type->typ_name); -GOTO (out, rc = -EINVAL ); - } - - ls = next->ld_site; - -spin_lock (&ls->ls_ld_lock); -list_for_each_entry (ld, &ls->ls_ld_linkage, ld_linkage) { -if (strcmp (ld->ld_type->ldt_name, tgt_type_name) ==0 ) { - found =1 ; -break ; - } - } -spin_unlock (&ls->ls_ld_lock); - -if (found ==0 ) { -CERROR ("%s is not lu device type!\n" , -lustre_cfg_string (cfg,1 )); -GOTO (out, rc = -EINVAL ); - } - - next = ld; -/* For MD echo client, it will use the site in MDS stack */ - ed->ed_site_myself.cs_lu = *ls; - ed->ed_site = &ed->ed_site_myself; - ed->ed_cl.cd_lu_dev.ld_site = &ed->ed_site_myself.cs_lu; - rc =echo_fid_init (ed, obd->obd_name,lu_site2seq (ls)); -if (rc) { -CERROR ("echo fid init error %d\n" , rc); +/* if echo client is to be stacked upon ost device, the next is +* NULL since ost is not a clio device so far */ +if (next !=NULL && !lu_device_is_cl (next)) + next =NULL ; + + tgt_type_name = tgt->obd_type->typ_name; +if (next !=NULL ) { +LASSERT (next !=NULL ); +if (next->ld_site !=NULL ) +GOTO (out, rc = -EBUSY ); + + next->ld_site = &ed->ed_site->cs_lu; + rc = next->ld_type->ldt_ops->ldto_device_init (env, next, + next->ld_type->ldt_name, +NULL ); +if (rc)GOTO (out, rc); - } + +/* Tricky case, I have to determine the obd type since +* CLIO uses the different parameters to initialize +* objects for lov & osc. */ +if (strcmp (tgt_type_name,LUSTRE_LOV_NAME ) ==0 ) + ed->ed_next_islov =1 ; +else +LASSERT (strcmp (tgt_type_name, +LUSTRE_OSC_NAME ) ==0 ); }else { -/* if echo client is to be stacked upon ost device, the next is -* NULL since ost is not a clio device so far */ -if (next !=NULL && !lu_device_is_cl (next)) - next =NULL ; - - tgt_type_name = tgt->obd_type->typ_name; -if (next !=NULL ) { -LASSERT (next !=NULL ); -if (next->ld_site !=NULL ) -GOTO (out, rc = -EBUSY ); - - next->ld_site = &ed->ed_site->cs_lu; - rc = next->ld_type->ldt_ops->ldto_device_init (env, next, - next->ld_type->ldt_name, -NULL ); -if (rc) -GOTO (out, rc); - -/* Tricky case, I have to determine the obd type since -* CLIO uses the different parameters to initialize -* objects for lov & osc. */ -if (strcmp (tgt_type_name,LUSTRE_LOV_NAME ) ==0 ) - ed->ed_next_islov =1 ; -else -LASSERT (strcmp (tgt_type_name, -LUSTRE_OSC_NAME ) ==0 ); - }else -LASSERT (strcmp (tgt_type_name,LUSTRE_OST_NAME ) ==0 ); +LASSERT (strcmp (tgt_type_name,LUSTRE_OST_NAME ) ==0 ); } ed->ed_next = next;
@@ -938,7 +827,7 @@ static struct lu_device *echo_device_fini(const struct lu_env *env,struct echo_device *ed =cl2echo_dev (lu2cl_dev (d));struct lu_device *next = ed->ed_next; -while (next && !ed->ed_next_ismd) +while (next) next = next->ld_type->ldt_ops->ldto_device_fini (env, next);return NULL ; }
@@ -1008,8 +897,8 @@ static struct lu_device *echo_device_free(const struct lu_env *env,CDEBUG (D_INFO ,"No object exists, exiting...\n" );echo_client_cleanup (d->ld_obd); -echo_fid_fini (d->ld_obd); -while (next && !ed->ed_next_ismd) + +while (next) next = next->ld_type->ldt_ops->ldto_device_free (env, next);LASSERT (ed->ed_site ==lu2cl_site (d->ld_site));
@@ -1037,7 +926,7 @@ static struct lu_device_type echo_device_type = { .ldt_tags = LU_DEVICE_CL, .ldt_name = LUSTRE_ECHO_CLIENT_NAME, .ldt_ops = &echo_device_type_ops, - .ldt_ctx_tags = LCT_CL_THREAD | LCT_MD_THREAD | LCT_DT_THREAD, + .ldt_ctx_tags = LCT_CL_THREAD, };/** @} echo_init */
@@ -1427,773 +1316,6 @@ echo_copyin_lsm (struct echo_device *ed, struct lov_stripe_md *lsm,return 0 ; } -static inline void echo_md_build_name (struct lu_name *lname,char *name, -__u64 id) -{ -sprintf (name,"%llu" , id); - lname->ln_name = name; - lname->ln_namelen =strlen (name); -} - -/* similar to mdt_attr_get_complex */ -static int echo_big_lmm_get (const struct lu_env *env,struct md_object *o, -struct md_attr *ma) -{ -struct echo_thread_info *info =echo_env_info (env); -int rc; - -LASSERT (ma->ma_lmm_size >0 ); - - rc =mo_xattr_get (env, o, &LU_BUF_NULL ,XATTR_NAME_LOV ); -if (rc <0 ) -return rc; - -/* big_lmm may need to be grown */ -if (info->eti_big_lmmsize < rc) { -int size =size_roundup_power2 (rc); - -if (info->eti_big_lmmsize >0 ) { -/* free old buffer */ -LASSERT (info->eti_big_lmm); -OBD_FREE_LARGE (info->eti_big_lmm, - info->eti_big_lmmsize); - info->eti_big_lmm =NULL ; - info->eti_big_lmmsize =0 ; - } - -OBD_ALLOC_LARGE (info->eti_big_lmm, size); -if (info->eti_big_lmm ==NULL ) -return -ENOMEM ; - info->eti_big_lmmsize = size; - } -LASSERT (info->eti_big_lmmsize >= rc); - - info->eti_buf.lb_buf = info->eti_big_lmm; - info->eti_buf.lb_len = info->eti_big_lmmsize; - rc =mo_xattr_get (env, o, &info->eti_buf,XATTR_NAME_LOV ); -if (rc <0 ) -return rc; - - ma->ma_valid |=MA_LOV ; - ma->ma_lmm = info->eti_big_lmm; - ma->ma_lmm_size = rc; - -return 0 ; -} - -int echo_attr_get_complex (const struct lu_env *env,struct md_object *next, -struct md_attr *ma) -{ -struct echo_thread_info *info =echo_env_info (env); -struct lu_buf *buf = &info->eti_buf; -umode_t mode =lu_object_attr (&next->mo_lu); -int need = ma->ma_need; -int rc =0 , rc2; - - ma->ma_valid =0 ; - -if (need &MA_INODE ) { - ma->ma_need =MA_INODE ; - rc =mo_attr_get (env, next, ma); -if (rc) -GOTO (out, rc); - ma->ma_valid |=MA_INODE ; - } - -if (need &MA_LOV ) { -if (S_ISREG (mode) ||S_ISDIR (mode)) { -LASSERT (ma->ma_lmm_size >0 ); - buf->lb_buf = ma->ma_lmm; - buf->lb_len = ma->ma_lmm_size; - rc2 =mo_xattr_get (env, next, buf,XATTR_NAME_LOV ); -if (rc2 >0 ) { - ma->ma_lmm_size = rc2; - ma->ma_valid |=MA_LOV ; - }else if (rc2 == -ENODATA ) { -/* no LOV EA */ - ma->ma_lmm_size =0 ; - }else if (rc2 == -ERANGE ) { - rc2 =echo_big_lmm_get (env, next, ma); -if (rc2 <0 ) -GOTO (out, rc = rc2); - }else { -GOTO (out, rc = rc2); - } - } - } - -#ifdef CONFIG_FS_POSIX_ACL -if (need &MA_ACL_DEF &&S_ISDIR (mode)) { - buf->lb_buf = ma->ma_acl; - buf->lb_len = ma->ma_acl_size; - rc2 =mo_xattr_get (env, next, buf,XATTR_NAME_ACL_DEFAULT ); -if (rc2 >0 ) { - ma->ma_acl_size = rc2; - ma->ma_valid |=MA_ACL_DEF ; - }else if (rc2 == -ENODATA ) { -/* no ACLs */ - ma->ma_acl_size =0 ; - }else { -GOTO (out, rc = rc2); - } - } -#endif -out: - ma->ma_need = need; -CDEBUG (D_INODE ,"after getattr rc = %d, ma_valid = %#llx ma_lmm=%p\n" , - rc, ma->ma_valid, ma->ma_lmm); -return rc; -} - -static int -echo_md_create_internal (const struct lu_env *env,struct echo_device *ed, -struct md_object *parent,struct lu_fid *fid, -struct lu_name *lname,struct md_op_spec *spec, -struct md_attr *ma) -{ -struct lu_object *ec_child, *child; -struct lu_device *ld = ed->ed_next; -struct echo_thread_info *info =echo_env_info (env); -struct lu_fid *fid2 = &info->eti_fid2; -struct lu_object_conf conf = { .loc_flags =LOC_F_NEW }; -int rc; - - rc =mdo_lookup (env, parent, lname, fid2, spec); -if (rc ==0 ) -return -EEXIST ; -else if (rc != -ENOENT ) -return rc; - - ec_child =lu_object_find_at (env, &ed->ed_cl.cd_lu_dev, - fid, &conf); -if (IS_ERR (ec_child)) { -CERROR ("Can not find the child " DFID ": rc = %ld\n" ,PFID (fid), -PTR_ERR (ec_child)); -return PTR_ERR (ec_child); - } - - child =lu_object_locate (ec_child->lo_header, ld->ld_type); -if (child ==NULL ) { -CERROR ("Can not locate the child " DFID "\n" ,PFID (fid)); -GOTO (out_put, rc = -EINVAL ); - } - -CDEBUG (D_RPCTRACE ,"Start creating object " DFID " %s %p\n" , -PFID (lu_object_fid (&parent->mo_lu)), lname->ln_name, parent); - -/* -* Do not perform lookup sanity check. We know that name does not exist. -*/ - spec->sp_cr_lookup =0 ; - rc =mdo_create (env, parent, lname,lu2md (child), spec, ma); -if (rc) { -CERROR ("Can not create child " DFID ": rc = %d\n" ,PFID (fid), rc); -GOTO (out_put, rc); - } -CDEBUG (D_RPCTRACE ,"End creating object " DFID " %s %p rc = %d\n" , -PFID (lu_object_fid (&parent->mo_lu)), lname->ln_name, parent, rc); -out_put: -lu_object_put (env, ec_child); -return rc; -} - -static int echo_set_lmm_size (const struct lu_env *env,struct lu_device *ld, -struct md_attr *ma) -{ -struct echo_thread_info *info =echo_env_info (env); - -if (strcmp (ld->ld_type->ldt_name,LUSTRE_MDD_NAME )) { - ma->ma_lmm = (void *)&info->eti_lmm; - ma->ma_lmm_size =sizeof (info->eti_lmm); - }else { -LASSERT (info->eti_big_lmmsize); - ma->ma_lmm = info->eti_big_lmm; - ma->ma_lmm_size = info->eti_big_lmmsize; - } - -return 0 ; -} - -static int echo_create_md_object (const struct lu_env *env, -struct echo_device *ed, -struct lu_object *ec_parent, -struct lu_fid *fid, -char *name,int namelen, -__u64 id,__u32 mode,int count, -int stripe_count,int stripe_offset) -{ -struct lu_object *parent; -struct echo_thread_info *info =echo_env_info (env); -struct lu_name *lname = &info->eti_lname; -struct md_op_spec *spec = &info->eti_spec; -struct md_attr *ma = &info->eti_ma; -struct lu_device *ld = ed->ed_next; -int rc =0 ; -int i; - -if (ec_parent ==NULL ) -return -1 ; - parent =lu_object_locate (ec_parent->lo_header, ld->ld_type); -if (parent ==NULL ) -return -ENXIO ; - -memset (ma,0 ,sizeof (*ma)); -memset (spec,0 ,sizeof (*spec)); -if (stripe_count !=0 ) { - spec->sp_cr_flags |=FMODE_WRITE ; -echo_set_lmm_size (env, ld, ma); -if (stripe_count !=-1 ) { -struct lov_user_md_v3 *lum = &info->eti_lum; - - lum->lmm_magic =LOV_USER_MAGIC_V3 ; - lum->lmm_stripe_count = stripe_count; - lum->lmm_stripe_offset = stripe_offset; - lum->lmm_pattern =0 ; - spec->u.sp_ea.eadata = lum; - spec->u.sp_ea.eadatalen =sizeof (*lum); - spec->sp_cr_flags |=MDS_OPEN_HAS_EA ; - } - } - - ma->ma_attr.la_mode = mode; - ma->ma_attr.la_valid =LA_CTIME |LA_MODE ; - ma->ma_attr.la_ctime =cfs_time_current_64 (); - -if (name !=NULL ) { - lname->ln_name = name; - lname->ln_namelen = namelen; -/* If name is specified, only create one object by name */ - rc =echo_md_create_internal (env, ed,lu2md (parent), fid, lname, - spec, ma); -return rc; - } - -/* Create multiple object sequenced by id */ -for (i =0 ; i < count; i++) { -char *tmp_name = info->eti_name; - -echo_md_build_name (lname, tmp_name, id); - - rc =echo_md_create_internal (env, ed,lu2md (parent), fid, lname, - spec, ma); -if (rc) { -CERROR ("Can not create child %s: rc = %d\n" , tmp_name, - rc); -break ; - } - id++; - fid->f_oid++; - } - -return rc; -} - -static struct lu_object *echo_md_lookup (const struct lu_env *env, -struct echo_device *ed, -struct md_object *parent, -struct lu_name *lname) -{ -struct echo_thread_info *info =echo_env_info (env); -struct lu_fid *fid = &info->eti_fid; -struct lu_object *child; -int rc; - -CDEBUG (D_INFO ,"lookup %s in parent " DFID " %p\n" , lname->ln_name, -PFID (fid), parent); - rc =mdo_lookup (env, parent, lname, fid,NULL ); -if (rc) { -CERROR ("lookup %s: rc = %d\n" , lname->ln_name, rc); -return ERR_PTR (rc); - } - -/* In the function below, .hs_keycmp resolves to -* lu_obj_hop_keycmp() */ -/* coverity[overrun-buffer-val] */ - child =lu_object_find_at (env, &ed->ed_cl.cd_lu_dev, fid,NULL ); - -return child; -} - -static int echo_setattr_object (const struct lu_env *env, -struct echo_device *ed, -struct lu_object *ec_parent, -__u64 id,int count) -{ -struct lu_object *parent; -struct echo_thread_info *info =echo_env_info (env); -struct lu_name *lname = &info->eti_lname; -char *name = info->eti_name; -struct lu_device *ld = ed->ed_next; -struct lu_buf *buf = &info->eti_buf; -int rc =0 ; -int i; - -if (ec_parent ==NULL ) -return -1 ; - parent =lu_object_locate (ec_parent->lo_header, ld->ld_type); -if (parent ==NULL ) -return -ENXIO ; - -for (i =0 ; i < count; i++) { -struct lu_object *ec_child, *child; - -echo_md_build_name (lname, name, id); - - ec_child =echo_md_lookup (env, ed,lu2md (parent), lname); -if (IS_ERR (ec_child)) { -CERROR ("Can't find child %s: rc = %ld\n" , - lname->ln_name,PTR_ERR (ec_child)); -return PTR_ERR (ec_child); - } - - child =lu_object_locate (ec_child->lo_header, ld->ld_type); -if (child ==NULL ) { -CERROR ("Can not locate the child %s\n" , lname->ln_name); -lu_object_put (env, ec_child); - rc = -EINVAL ; -break ; - } - -CDEBUG (D_RPCTRACE ,"Start setattr object " DFID "\n" , -PFID (lu_object_fid (child))); - - buf->lb_buf = info->eti_xattr_buf; - buf->lb_len =sizeof (info->eti_xattr_buf); - -sprintf (name,"%s.test1" ,XATTR_USER_PREFIX ); - rc =mo_xattr_set (env,lu2md (child), buf, name, -LU_XATTR_CREATE ); -if (rc <0 ) { -CERROR ("Can not setattr child " DFID ": rc = %d\n" , -PFID (lu_object_fid (child)), rc); -lu_object_put (env, ec_child); -break ; - } -CDEBUG (D_RPCTRACE ,"End setattr object " DFID "\n" , -PFID (lu_object_fid (child))); - id++; -lu_object_put (env, ec_child); - } -return rc; -} - -static int echo_getattr_object (const struct lu_env *env, -struct echo_device *ed, -struct lu_object *ec_parent, -__u64 id,int count) -{ -struct lu_object *parent; -struct echo_thread_info *info =echo_env_info (env); -struct lu_name *lname = &info->eti_lname; -char *name = info->eti_name; -struct md_attr *ma = &info->eti_ma; -struct lu_device *ld = ed->ed_next; -int rc =0 ; -int i; - -if (ec_parent ==NULL ) -return -1 ; - parent =lu_object_locate (ec_parent->lo_header, ld->ld_type); -if (parent ==NULL ) -return -ENXIO ; - -memset (ma,0 ,sizeof (*ma)); - ma->ma_need |=MA_INODE |MA_LOV |MA_PFID |MA_HSM |MA_ACL_DEF ; - ma->ma_acl = info->eti_xattr_buf; - ma->ma_acl_size =sizeof (info->eti_xattr_buf); - -for (i =0 ; i < count; i++) { -struct lu_object *ec_child, *child; - - ma->ma_valid =0 ; -echo_md_build_name (lname, name, id); -echo_set_lmm_size (env, ld, ma); - - ec_child =echo_md_lookup (env, ed,lu2md (parent), lname); -if (IS_ERR (ec_child)) { -CERROR ("Can't find child %s: rc = %ld\n" , - lname->ln_name,PTR_ERR (ec_child)); -return PTR_ERR (ec_child); - } - - child =lu_object_locate (ec_child->lo_header, ld->ld_type); -if (child ==NULL ) { -CERROR ("Can not locate the child %s\n" , lname->ln_name); -lu_object_put (env, ec_child); -return -EINVAL ; - } - -CDEBUG (D_RPCTRACE ,"Start getattr object " DFID "\n" , -PFID (lu_object_fid (child))); - rc =echo_attr_get_complex (env,lu2md (child), ma); -if (rc) { -CERROR ("Can not getattr child " DFID ": rc = %d\n" , -PFID (lu_object_fid (child)), rc); -lu_object_put (env, ec_child); -break ; - } -CDEBUG (D_RPCTRACE ,"End getattr object " DFID "\n" , -PFID (lu_object_fid (child))); - id++; -lu_object_put (env, ec_child); - } - -return rc; -} - -static int echo_lookup_object (const struct lu_env *env, -struct echo_device *ed, -struct lu_object *ec_parent, -__u64 id,int count) -{ -struct lu_object *parent; -struct echo_thread_info *info =echo_env_info (env); -struct lu_name *lname = &info->eti_lname; -char *name = info->eti_name; -struct lu_fid *fid = &info->eti_fid; -struct lu_device *ld = ed->ed_next; -int rc =0 ; -int i; - -if (ec_parent ==NULL ) -return -1 ; - parent =lu_object_locate (ec_parent->lo_header, ld->ld_type); -if (parent ==NULL ) -return -ENXIO ; - -/*prepare the requests*/ -for (i =0 ; i < count; i++) { -echo_md_build_name (lname, name, id); - -CDEBUG (D_RPCTRACE ,"Start lookup object " DFID " %s %p\n" , -PFID (lu_object_fid (parent)), lname->ln_name, parent); - - rc =mdo_lookup (env,lu2md (parent), lname, fid,NULL ); -if (rc) { -CERROR ("Can not lookup child %s: rc = %d\n" , name, rc); -break ; - } -CDEBUG (D_RPCTRACE ,"End lookup object " DFID " %s %p\n" , -PFID (lu_object_fid (parent)), lname->ln_name, parent); - - id++; - } -return rc; -} - -static int echo_md_destroy_internal (const struct lu_env *env, -struct echo_device *ed, -struct md_object *parent, -struct lu_name *lname, -struct md_attr *ma) -{ -struct lu_device *ld = ed->ed_next; -struct lu_object *ec_child; -struct lu_object *child; -int rc; - - ec_child =echo_md_lookup (env, ed, parent, lname); -if (IS_ERR (ec_child)) { -CERROR ("Can't find child %s: rc = %ld\n" , lname->ln_name, -PTR_ERR (ec_child)); -return PTR_ERR (ec_child); - } - - child =lu_object_locate (ec_child->lo_header, ld->ld_type); -if (child ==NULL ) { -CERROR ("Can not locate the child %s\n" , lname->ln_name); -GOTO (out_put, rc = -EINVAL ); - } - -CDEBUG (D_RPCTRACE ,"Start destroy object " DFID " %s %p\n" , -PFID (lu_object_fid (&parent->mo_lu)), lname->ln_name, parent); - - rc =mdo_unlink (env, parent,lu2md (child), lname, ma,0 ); -if (rc) { -CERROR ("Can not unlink child %s: rc = %d\n" , - lname->ln_name, rc); -GOTO (out_put, rc); - } -CDEBUG (D_RPCTRACE ,"End destroy object " DFID " %s %p\n" , -PFID (lu_object_fid (&parent->mo_lu)), lname->ln_name, parent); -out_put: -lu_object_put (env, ec_child); -return rc; -} - -static int echo_destroy_object (const struct lu_env *env, -struct echo_device *ed, -struct lu_object *ec_parent, -char *name,int namelen, -__u64 id,__u32 mode, -int count) -{ -struct echo_thread_info *info =echo_env_info (env); -struct lu_name *lname = &info->eti_lname; -struct md_attr *ma = &info->eti_ma; -struct lu_device *ld = ed->ed_next; -struct lu_object *parent; -int rc =0 ; -int i; - - parent =lu_object_locate (ec_parent->lo_header, ld->ld_type); -if (parent ==NULL ) -return -EINVAL ; - -memset (ma,0 ,sizeof (*ma)); - ma->ma_attr.la_mode = mode; - ma->ma_attr.la_valid =LA_CTIME ; - ma->ma_attr.la_ctime =cfs_time_current_64 (); - ma->ma_need =MA_INODE ; - ma->ma_valid =0 ; - -if (name !=NULL ) { - lname->ln_name = name; - lname->ln_namelen = namelen; - rc =echo_md_destroy_internal (env, ed,lu2md (parent), lname, - ma); -return rc; - } - -/*prepare the requests*/ -for (i =0 ; i < count; i++) { -char *tmp_name = info->eti_name; - - ma->ma_valid =0 ; -echo_md_build_name (lname, tmp_name, id); - - rc =echo_md_destroy_internal (env, ed,lu2md (parent), lname, - ma); -if (rc) { -CERROR ("Can not unlink child %s: rc = %d\n" , name, rc); -break ; - } - id++; - } - -return rc; -} - -static struct lu_object *echo_resolve_path (const struct lu_env *env, -struct echo_device *ed,char *path, -int path_len) -{ -struct lu_device *ld = ed->ed_next; -struct md_device *md =lu2md_dev (ld); -struct echo_thread_info *info =echo_env_info (env); -struct lu_fid *fid = &info->eti_fid; -struct lu_name *lname = &info->eti_lname; -struct lu_object *parent =NULL ; -struct lu_object *child =NULL ; -int rc =0 ; - -/*Only support MDD layer right now*/ - rc = md->md_ops->mdo_root_get (env, md, fid); -if (rc) { -CERROR ("get root error: rc = %d\n" , rc); -return ERR_PTR (rc); - } - -/* In the function below, .hs_keycmp resolves to -* lu_obj_hop_keycmp() */ -/* coverity[overrun-buffer-val] */ - parent =lu_object_find_at (env, &ed->ed_cl.cd_lu_dev, fid,NULL ); -if (IS_ERR (parent)) { -CERROR ("Can not find the parent " DFID ": rc = %ld\n" , -PFID (fid),PTR_ERR (parent)); -return parent; - } - -while (1 ) { -struct lu_object *ld_parent; -char *e; - - e =strsep (&path,"/" ); -if (e ==NULL ) -break ; - -if (e[0 ] ==0 ) { -if (!path || path[0 ] =='\0' ) -break ; -continue ; - } - - lname->ln_name = e; - lname->ln_namelen =strlen (e); - - ld_parent =lu_object_locate (parent->lo_header, ld->ld_type); -if (ld_parent ==NULL ) { -lu_object_put (env, parent); - rc = -EINVAL ; -break ; - } - - child =echo_md_lookup (env, ed,lu2md (ld_parent), lname); -lu_object_put (env, parent); -if (IS_ERR (child)) { - rc = (int )PTR_ERR (child); -CERROR ("lookup %s under parent " DFID ": rc = %d\n" , - lname->ln_name,PFID (lu_object_fid (ld_parent)), - rc); -break ; - } - parent = child; - } -if (rc) -return ERR_PTR (rc); - -return parent; -} - -static void echo_ucred_init (struct lu_env *env) -{ -struct lu_ucred *ucred =lu_ucred (env); - - ucred->uc_valid =UCRED_INVALID ; - - ucred->uc_suppgids[0 ] =-1 ; - ucred->uc_suppgids[1 ] =-1 ; - - ucred->uc_uid = ucred->uc_o_uid = -from_kuid (&init_user_ns,current_uid ()); - ucred->uc_gid = ucred->uc_o_gid = -from_kgid (&init_user_ns,current_gid ()); - ucred->uc_fsuid = ucred->uc_o_fsuid = -from_kuid (&init_user_ns,current_fsuid ()); - ucred->uc_fsgid = ucred->uc_o_fsgid = -from_kgid (&init_user_ns,current_fsgid ()); - ucred->uc_cap =cfs_curproc_cap_pack (); - -/* remove fs privilege for non-root user. */ -if (ucred->uc_fsuid) - ucred->uc_cap &= ~CFS_CAP_FS_MASK ; - ucred->uc_valid =UCRED_NEW ; -} - -static void echo_ucred_fini (struct lu_env *env) -{ -struct lu_ucred *ucred =lu_ucred (env); - ucred->uc_valid =UCRED_INIT ; -} - -#define ECHO_MD_CTX_TAG (LCT_REMEMBER | LCT_MD_THREAD) -#define ECHO_MD_SES_TAG (LCT_REMEMBER | LCT_SESSION) -static int echo_md_handler (struct echo_device *ed,int command, -char *path,int path_len,__u64 id,int count, -struct obd_ioctl_data *data) -{ -struct echo_thread_info *info; -struct lu_device *ld = ed->ed_next; -struct lu_env *env; -int refcheck; -struct lu_object *parent; -char *name =NULL ; -int namelen = data->ioc_plen2; -int rc =0 ; - -if (ld ==NULL ) { -CERROR ("MD echo client is not being initialized properly\n" ); -return -EINVAL ; - } - -if (strcmp (ld->ld_type->ldt_name,LUSTRE_MDD_NAME )) { -CERROR ("Only support MDD layer right now!\n" ); -return -EINVAL ; - } - - env =cl_env_get (&refcheck); -if (IS_ERR (env)) -return PTR_ERR (env); - - rc =lu_env_refill_by_tags (env,ECHO_MD_CTX_TAG ,ECHO_MD_SES_TAG ); -if (rc !=0 ) -GOTO (out_env, rc); - -/* init big_lmm buffer */ - info =echo_env_info (env); -LASSERT (info->eti_big_lmm ==NULL ); -OBD_ALLOC_LARGE (info->eti_big_lmm,MIN_MD_SIZE ); -if (info->eti_big_lmm ==NULL ) -GOTO (out_env, rc = -ENOMEM ); - info->eti_big_lmmsize =MIN_MD_SIZE ; - - parent =echo_resolve_path (env, ed, path, path_len); -if (IS_ERR (parent)) { -CERROR ("Can not resolve the path %s: rc = %ld\n" , path, -PTR_ERR (parent)); -GOTO (out_free, rc =PTR_ERR (parent)); - } - -if (namelen >0 ) { -OBD_ALLOC (name, namelen +1 ); -if (name ==NULL ) -GOTO (out_put, rc = -ENOMEM ); -if (copy_from_user (name, data->ioc_pbuf2, namelen)) -GOTO (out_name, rc = -EFAULT ); - } - -echo_ucred_init (env); - -switch (command) { -case ECHO_MD_CREATE : -case ECHO_MD_MKDIR : { -struct echo_thread_info *info =echo_env_info (env); -__u32 mode = data->ioc_obdo2.o_mode; -struct lu_fid *fid = &info->eti_fid; -int stripe_count = (int )data->ioc_obdo2.o_misc; -int stripe_index = (int )data->ioc_obdo2.o_stripe_idx; - - rc =ostid_to_fid (fid, &data->ioc_obdo1.o_oi,0 ); -if (rc !=0 ) -break ; - -/* In the function below, .hs_keycmp resolves to -* lu_obj_hop_keycmp() */ -/* coverity[overrun-buffer-val] */ - rc =echo_create_md_object (env, ed, parent, fid, name, namelen, - id, mode, count, stripe_count, - stripe_index); -break ; - } -case ECHO_MD_DESTROY : -case ECHO_MD_RMDIR : { -__u32 mode = data->ioc_obdo2.o_mode; - - rc =echo_destroy_object (env, ed, parent, name, namelen, - id, mode, count); -break ; - } -case ECHO_MD_LOOKUP : - rc =echo_lookup_object (env, ed, parent, id, count); -break ; -case ECHO_MD_GETATTR : - rc =echo_getattr_object (env, ed, parent, id, count); -break ; -case ECHO_MD_SETATTR : - rc =echo_setattr_object (env, ed, parent, id, count); -break ; -default : -CERROR ("unknown command %d\n" , command); - rc = -EINVAL ; -break ; - } -echo_ucred_fini (env); - -out_name: -if (name !=NULL ) -OBD_FREE (name, namelen +1 ); -out_put: -lu_object_put (env, parent); -out_free: -LASSERT (info->eti_big_lmm); -OBD_FREE_LARGE (info->eti_big_lmm, info->eti_big_lmmsize); - info->eti_big_lmm =NULL ; - info->eti_big_lmmsize =0 ; -out_env: -cl_env_put (env, &refcheck); -return rc; -} -static int echo_create_object (const struct lu_env *env,struct echo_device *ed,int on_target,struct obdo *oa,void *ulsm,int ulsm_nob,struct obd_trans_info *oti)
@@ -2770,72 +1892,6 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len, data->ioc_plen1, &dummy_oti);GOTO (out, rc); -case OBD_IOC_ECHO_MD : { -int count; -int cmd; -char *dir =NULL ; -int dirlen; -__u64 id; - -if (!capable (CFS_CAP_SYS_ADMIN )) -GOTO (out, rc = -EPERM ); - - count = data->ioc_count; - cmd = data->ioc_command; - - id =ostid_id (&data->ioc_obdo2.o_oi); - - dirlen = data->ioc_plen1; -OBD_ALLOC (dir, dirlen +1 ); -if (dir ==NULL ) -GOTO (out, rc = -ENOMEM ); - -if (copy_from_user (dir, data->ioc_pbuf1, dirlen)) { -OBD_FREE (dir, data->ioc_plen1 +1 ); -GOTO (out, rc = -EFAULT ); - } - - rc =echo_md_handler (ed, cmd, dir, dirlen, id, count, data); -OBD_FREE (dir, dirlen +1 ); -GOTO (out, rc); - } -case OBD_IOC_ECHO_ALLOC_SEQ : { -struct lu_env *cl_env; -int refcheck; -__u64 seq; -int max_count; - -if (!capable (CFS_CAP_SYS_ADMIN )) -GOTO (out, rc = -EPERM ); - - cl_env =cl_env_get (&refcheck); -if (IS_ERR (cl_env)) -GOTO (out, rc =PTR_ERR (cl_env)); - - rc =lu_env_refill_by_tags (cl_env,ECHO_MD_CTX_TAG , -ECHO_MD_SES_TAG ); -if (rc !=0 ) { -cl_env_put (cl_env, &refcheck); -GOTO (out, rc); - } - - rc =seq_client_get_seq (cl_env, ed->ed_cl_seq, &seq); -cl_env_put (cl_env, &refcheck); -if (rc <0 ) { -CERROR ("%s: Can not alloc seq: rc = %d\n" , - obd->obd_name, rc); -GOTO (out, rc); - } - -if (copy_to_user (data->ioc_pbuf1, &seq, data->ioc_plen1)) -return -EFAULT ; - - max_count =LUSTRE_METADATA_SEQ_MAX_WIDTH ; -if (copy_to_user (data->ioc_pbuf2, &max_count, - data->ioc_plen2)) -return -EFAULT ; -GOTO (out, rc); - }case OBD_IOC_DESTROY :if (!capable (CFS_CAP_SYS_ADMIN ))GOTO (out, rc = -EPERM );
@@ -2973,12 +2029,6 @@ static int echo_client_setup(const struct lu_env *env, ec->ec_unique =0 ; ec->ec_nstripes =0 ; -if (!strcmp (tgt->obd_type->typ_name,LUSTRE_MDT_NAME )) { -lu_context_tags_update (ECHO_MD_CTX_TAG ); -lu_session_tags_update (ECHO_MD_SES_TAG ); -return 0 ; - } -OBD_ALLOC (ocd,sizeof (*ocd));if (ocd ==NULL ) { CERROR("Can't alloc ocd connecting to %s\n",
@@ -3016,20 +2066,9 @@ static int echo_client_setup(const struct lu_env *env,static int echo_client_cleanup (struct obd_device *obddev) { -struct echo_device *ed =obd2echo_dev (obddev);struct echo_client_obd *ec = &obddev->u.echo_client;int rc; -/*Do nothing for Metadata echo client*/ -if (ed ==NULL ) -return 0 ; - -if (ed->ed_next_ismd) { -lu_context_tags_clear (ECHO_MD_CTX_TAG ); -lu_session_tags_clear (ECHO_MD_SES_TAG ); -return 0 ; - } -if (!list_empty (&obddev->obd_exports)) {CERROR ("still has clients!\n" );return -EBUSY ;
Signature · 1 line
1.9.3
PATCH 3/12 staging/lustre/obdecho: remove #if 0-ed out regions
In reply to Oleg DrokinFrom: "John L. Hammond" <[email protected]>
The landing of clio #if 0-ed out some regions of echo_client.c. Just remove these regions entirely.
Reviewed-on: http://review.whamcloud.com/5580
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
--- .../staging/lustre/lustre/obdecho/echo_client.c | 50 ---------------------- 1 file changed, 50 deletions(-)
drivers/staging/lustre/lustre/obdecho/echo_client.c +0 -50
@@ -93,16 +93,6 @@ struct echo_lock {atomic_t el_refcount; }; -struct echo_io { -struct cl_io_slice ei_cl; -}; - -#if 0 -struct echo_req { -struct cl_req_slice er_cl; -}; -#endif -static int echo_client_setup (const struct lu_env *env,struct obd_device *obddev,struct lustre_cfg *lcfg);
@@ -200,7 +190,6 @@ static struct kmem_cache *echo_lock_kmem;static struct kmem_cache *echo_object_kmem;static struct kmem_cache *echo_thread_kmem;static struct kmem_cache *echo_session_kmem; -//static struct kmem_cache *echo_req_kmem; static struct lu_kmem_descr echo_caches[] = { {
@@ -223,13 +212,6 @@ static struct lu_kmem_descr echo_caches[] = { .ckd_name = "echo_session_kmem", .ckd_size = sizeof (struct echo_session_info) }, -#if 0 - { - .ckd_cache = &echo_req_kmem, - .ckd_name = "echo_req_kmem", - .ckd_size = sizeof (struct echo_req) - }, -#endif { .ckd_cache = NULL }
@@ -2100,37 +2082,11 @@ static int echo_client_connect(const struct lu_env *env,static int echo_client_disconnect (struct obd_export *exp) { -#if 0 -struct obd_device *obd; -struct echo_client_obd *ec; -struct ec_lock *ecl; -#endif int rc;if (exp ==NULL )GOTO (out, rc = -EINVAL ); -#if 0 - obd = exp->exp_obd; - ec = &obd->u.echo_client; - -/* no more contention on export's lock list */ -while (!list_empty (&exp->exp_ec_data.eced_locks)) { - ecl =list_entry (exp->exp_ec_data.eced_locks.next, - struct ec_lock, ecl_exp_chain); -list_del (&ecl->ecl_exp_chain); - - rc =obd_cancel (ec->ec_exp, ecl->ecl_object->eco_lsm, - ecl->ecl_mode, &ecl->ecl_lock_handle); - -CDEBUG (D_INFO ,"Cancel lock on object %#llx on disconnect " -"(%d)\n" , ecl->ecl_object->eco_id, rc); - -echo_put_object (ecl->ecl_object); -OBD_FREE (ecl,sizeof (*ecl)); - } -#endif - rc =class_disconnect (exp);GOTO (out, rc); out:
@@ -2139,12 +2095,6 @@ static int echo_client_disconnect(struct obd_export *exp)static struct obd_ops echo_client_obd_ops = { .o_owner =THIS_MODULE , - -#if 0 - .o_setup = echo_client_setup, - .o_cleanup = echo_client_cleanup, -#endif - .o_iocontrol = echo_client_iocontrol, .o_connect = echo_client_connect, .o_disconnect = echo_client_disconnect
Signature · 1 line
1.9.3
PATCH 4/12 staging/lustre/obdclass: remove idmap.c
In reply to Oleg DrokinFrom: "John L. Hammond" <[email protected]>
The functions defined in lustre/include/lustre_idmap.h are not used so remove them.
--- .../staging/lustre/lustre/include/lustre_idmap.h | 104 ----- drivers/staging/lustre/lustre/obdclass/Makefile | 2 +- drivers/staging/lustre/lustre/obdclass/idmap.c | 477 --------------------- 3 files changed, 1 insertion(+), 582 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/lustre_idmap.h delete mode 100644 drivers/staging/lustre/lustre/obdclass/idmap.c
drivers/staging/lustre/lustre/include/lustre_idmap.h deleted +0 -104
@@ -1,104 +0,0 @@ -/* -* GPL HEADER START -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 only, -* as published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License version 2 for more details (a copy is included -* in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU General Public License -* version 2 along with this program; If not, see -* http://www.sun.com/software/products/lustre/docs/GPLv2.pdf -* -* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -* CA 95054 USA or visit www.sun.com if you need additional information or -* have any questions. -* -* GPL HEADER END -*/ -/* -* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -* Use is subject to license terms. -* -* Copyright (c) 2012, Intel Corporation. -*/ -/* -* This file is part of Lustre, http://www.lustre.org/ -* Lustre is a trademark of Sun Microsystems, Inc. -* -* lustre/lustre/include/lustre_idmap.h -* -* MDS data structures. -* See also lustre_idl.h for wire formats of requests. -*/ - -#ifndef _LUSTRE_IDMAP_H -#define _LUSTRE_IDMAP_H - -/** \defgroup idmap idmap -* -* @{ -*/ - -#include "../../include/linux/libcfs/libcfs.h" - -#define CFS_NGROUPS_PER_BLOCK ((int)(PAGE_CACHE_SIZE / sizeof(gid_t))) - -#define CFS_GROUP_AT (gi, i) \ - ((gi)->blocks[(i) / CFS_NGROUPS_PER_BLOCK][(i) % CFS_NGROUPS_PER_BLOCK]) - -enum { -CFS_IC_NOTHING =0 ,/* convert nothing */ -CFS_IC_ALL =1 ,/* convert all items */ -CFS_IC_MAPPED =2 ,/* convert mapped uid/gid */ -CFS_IC_UNMAPPED =3 /* convert unmapped uid/gid */ -}; - -#define CFS_IDMAP_NOTFOUND (-1) - -#define CFS_IDMAP_HASHSIZE 32 - -enum lustre_idmap_idx { -RMT_UIDMAP_IDX , -LCL_UIDMAP_IDX , -RMT_GIDMAP_IDX , -LCL_GIDMAP_IDX , -CFS_IDMAP_N_HASHES -}; - -struct lustre_idmap_table { -spinlock_t lit_lock; -struct list_head lit_idmaps[CFS_IDMAP_N_HASHES ][CFS_IDMAP_HASHSIZE ]; -}; - -struct lu_ucred ; - -extern void lustre_groups_from_list (struct group_info *ginfo,gid_t *glist); -extern void lustre_groups_sort (struct group_info *group_info); -extern int lustre_in_group_p (struct lu_ucred *mu,gid_t grp); - -extern int lustre_idmap_add (struct lustre_idmap_table *t, -uid_t ruid,uid_t luid, -gid_t rgid,gid_t lgid); -extern int lustre_idmap_del (struct lustre_idmap_table *t, -uid_t ruid,uid_t luid, -gid_t rgid,gid_t lgid); -extern int lustre_idmap_lookup_uid (struct lu_ucred *mu, -struct lustre_idmap_table *t, -int reverse,uid_t uid); -extern int lustre_idmap_lookup_gid (struct lu_ucred *mu, -struct lustre_idmap_table *t, -int reverse,gid_t gid); -extern struct lustre_idmap_table *lustre_idmap_init (void ); -extern void lustre_idmap_fini (struct lustre_idmap_table *t); - -/** @} idmap */ - -#endif
drivers/staging/lustre/lustre/obdclass/Makefile +1 -1
@@ -6,5 +6,5 @@ obdclass-y := linux/linux-module.o linux/linux-obdo.o linux/linux-sysctl.o \ lustre_handles.o lustre_peer.o llog_osd.o \ local_storage.o statfs_pack.o obdo.o obd_config.o obd_mount.o\ mea.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 idmap.o \ + cl_page.o cl_lock.o cl_io.o lu_ref.o acl.o \ lu_ucred.o
drivers/staging/lustre/lustre/obdclass/idmap.c deleted +0 -477
477 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH 5/12 staging/lustre/obdclass: remove lu_ucred.c
In reply to Oleg DrokinFrom: "John L. Hammond" <[email protected]>
The functions exported by lustre/obdclass/lu_ucred.c are not used so remove that file.
--- drivers/staging/lustre/lustre/obdclass/Makefile | 3 +- drivers/staging/lustre/lustre/obdclass/lu_ucred.c | 107 ---------------------- 2 files changed, 1 insertion(+), 109 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ucred.c
drivers/staging/lustre/lustre/obdclass/Makefile +1 -2
@@ -6,5 +6,4 @@ obdclass-y := linux/linux-module.o linux/linux-obdo.o linux/linux-sysctl.o \ lustre_handles.o lustre_peer.o llog_osd.o \ local_storage.o statfs_pack.o obdo.o obd_config.o obd_mount.o\ mea.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 \ - lu_ucred.o + cl_page.o cl_lock.o cl_io.o lu_ref.o acl.o
drivers/staging/lustre/lustre/obdclass/lu_ucred.c deleted +0 -107
107 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH 6/12 staging/lustre/obdclass: remove mea.c
In reply to Oleg DrokinFrom: "John L. Hammond" <[email protected]>
The functions exported by lustre/obdclass/mea.c are not used so remove them.
--- drivers/staging/lustre/lustre/include/obd_class.h | 4 - drivers/staging/lustre/lustre/obdclass/Makefile | 2 +- drivers/staging/lustre/lustre/obdclass/mea.c | 112 ---------------------- 3 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/obdclass/mea.c
drivers/staging/lustre/lustre/include/obd_class.h +0 -4
@@ -2182,10 +2182,6 @@ int class_check_uuid(struct obd_uuid *uuid, __u64 nid);void class_init_uuidlist (void );void class_exit_uuidlist (void ); -/* mea.c */ -int mea_name2idx (struct lmv_stripe_md *mea,const char *name,int namelen); -int raw_name2idx (int hashtype,int count,const char *name,int namelen); -/* class_obd.c */ extern char obd_jobid_node[];
drivers/staging/lustre/lustre/obdclass/Makefile +1 -1
@@ -5,5 +5,5 @@ obdclass-y := linux/linux-module.o linux/linux-obdo.o linux/linux-sysctl.o \ genops.o uuid.o llog_ioctl.o lprocfs_status.o \ lustre_handles.o lustre_peer.o llog_osd.o \ local_storage.o statfs_pack.o obdo.o obd_config.o obd_mount.o\ - mea.o lu_object.o dt_object.o capa.o cl_object.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/mea.c deleted +0 -112
112 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH 7/12 staging/lustre: remove md_object.h
In reply to Oleg DrokinFrom: "John L. Hammond" <[email protected]>
The declarations from lustre/include/md_object.h are not used so remove them.
--- drivers/staging/lustre/lustre/fid/lproc_fid.c | 1 - drivers/staging/lustre/lustre/fld/fld_cache.c | 1 - drivers/staging/lustre/lustre/fld/fld_request.c | 1 - drivers/staging/lustre/lustre/fld/lproc_fld.c | 1 - drivers/staging/lustre/lustre/include/md_object.h | 899 ---------------------- 5 files changed, 903 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/md_object.h
drivers/staging/lustre/lustre/fid/lproc_fid.c +0 -1
@@ -48,7 +48,6 @@#include "../include/obd.h" #include "../include/obd_class.h" #include "../include/dt_object.h" -#include "../include/md_object.h" #include "../include/obd_support.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fid.h"
drivers/staging/lustre/lustre/fld/fld_cache.c +0 -1
@@ -54,7 +54,6 @@#include "../include/lprocfs_status.h" #include "../include/dt_object.h" -#include "../include/md_object.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fld.h" #include "fld_internal.h"
drivers/staging/lustre/lustre/fld/fld_request.c +0 -1
@@ -53,7 +53,6 @@#include "../include/lprocfs_status.h" #include "../include/dt_object.h" -#include "../include/md_object.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fld.h" #include "../include/lustre_mdc.h"
drivers/staging/lustre/lustre/fld/lproc_fld.c +0 -1
@@ -49,7 +49,6 @@#include "../include/obd.h" #include "../include/obd_class.h" #include "../include/dt_object.h" -#include "../include/md_object.h" #include "../include/obd_support.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fld.h"
drivers/staging/lustre/lustre/include/md_object.h deleted +0 -899
899 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH 8/12 staging/lustre/mgc: remove server specific handlers
In reply to Oleg DrokinFrom: "John L. Hammond" <[email protected]>
Remove the server specific set_info handlers (KEY_REGISTER_TARGET, KEY_SET_FS, KEY_CLEAR_FS) and supporting functions.
--- drivers/staging/lustre/lustre/mgc/mgc_request.c | 177 ------------------------ 1 file changed, 177 deletions(-)
drivers/staging/lustre/lustre/mgc/mgc_request.c +0 -177
@@ -47,7 +47,6 @@#include "../include/lprocfs_status.h" #include "../include/lustre_log.h" #include "../include/lustre_disk.h" -#include "../include/dt_object.h" #include "mgc_internal.h"
@@ -628,150 +627,6 @@ static void mgc_requeue_add(struct config_llog_data *cld) } } -/********************** class fns **********************/ -static int mgc_local_llog_init (const struct lu_env *env, -struct obd_device *obd, -struct obd_device *disk) -{ -struct llog_ctxt *ctxt; -int rc; - - rc =llog_setup (env, obd, &obd->obd_olg,LLOG_CONFIG_ORIG_CTXT , disk, - &llog_osd_ops); -if (rc) -return rc; - - ctxt =llog_get_context (obd,LLOG_CONFIG_ORIG_CTXT ); -LASSERT (ctxt); - ctxt->loc_dir = obd->u.cli.cl_mgc_configs_dir; -llog_ctxt_put (ctxt); - -return 0 ; -} - -static int mgc_local_llog_fini (const struct lu_env *env, -struct obd_device *obd) -{ -struct llog_ctxt *ctxt; - - ctxt =llog_get_context (obd,LLOG_CONFIG_ORIG_CTXT ); -llog_cleanup (env, ctxt); - -return 0 ; -} - -static int mgc_fs_setup (struct obd_device *obd,struct super_block *sb) -{ -struct lustre_sb_info *lsi =s2lsi (sb); -struct client_obd *cli = &obd->u.cli; -struct lu_fid rfid, fid; -struct dt_object *root, *dto; -struct lu_env *env; -int rc =0 ; - -LASSERT (lsi); -LASSERT (lsi->lsi_dt_dev); - -OBD_ALLOC_PTR (env); -if (env ==NULL ) -return -ENOMEM ; - -/* The mgc fs exclusion mutex. Only one fs can be setup at a time. */ -mutex_lock (&cli->cl_mgc_mutex); - -cfs_cleanup_group_info (); - -/* Setup the configs dir */ - rc =lu_env_init (env,LCT_MG_THREAD ); -if (rc) - goto out_err; - - fid.f_seq =FID_SEQ_LOCAL_NAME ; - fid.f_oid =1 ; - fid.f_ver =0 ; - rc =local_oid_storage_init (env, lsi->lsi_dt_dev, &fid, - &cli->cl_mgc_los); -if (rc) - goto out_env; - - rc =dt_root_get (env, lsi->lsi_dt_dev, &rfid); -if (rc) - goto out_env; - - root =dt_locate_at (env, lsi->lsi_dt_dev, &rfid, - &cli->cl_mgc_los->los_dev->dd_lu_dev); -if (unlikely (IS_ERR (root))) { - rc =PTR_ERR (root); - goto out_los; - } - - dto =local_file_find_or_create (env, cli->cl_mgc_los, root, -MOUNT_CONFIGS_DIR , -S_IFDIR |S_IRUGO |S_IWUSR |S_IXUGO ); -lu_object_put_nocache (env, &root->do_lu); -if (IS_ERR (dto)) { - rc =PTR_ERR (dto); - goto out_los; - } - - cli->cl_mgc_configs_dir = dto; - -LASSERT (lsi->lsi_osd_exp->exp_obd->obd_lvfs_ctxt.dt); - rc =mgc_local_llog_init (env, obd, lsi->lsi_osd_exp->exp_obd); -if (rc) - goto out_llog; - -/* We take an obd ref to insure that we can't get to mgc_cleanup -* without calling mgc_fs_cleanup first. */ -class_incref (obd,"mgc_fs" , obd); - -/* We keep the cl_mgc_sem until mgc_fs_cleanup */ -out_llog: -if (rc) { -lu_object_put (env, &cli->cl_mgc_configs_dir->do_lu); - cli->cl_mgc_configs_dir =NULL ; - } -out_los: -if (rc <0 ) { -local_oid_storage_fini (env, cli->cl_mgc_los); - cli->cl_mgc_los =NULL ; -mutex_unlock (&cli->cl_mgc_mutex); - } -out_env: -lu_env_fini (env); -out_err: -OBD_FREE_PTR (env); -return rc; -} - -static int mgc_fs_cleanup (struct obd_device *obd) -{ -struct lu_env env; -struct client_obd *cli = &obd->u.cli; -int rc; - -LASSERT (cli->cl_mgc_los !=NULL ); - - rc =lu_env_init (&env,LCT_MG_THREAD ); -if (rc) - goto unlock; - -mgc_local_llog_fini (&env, obd); - -lu_object_put_nocache (&env, &cli->cl_mgc_configs_dir->do_lu); - cli->cl_mgc_configs_dir =NULL ; - -local_oid_storage_fini (&env, cli->cl_mgc_los); - cli->cl_mgc_los =NULL ; -lu_env_fini (&env); - -unlock: -class_decref (obd,"mgc_fs" , obd); -mutex_unlock (&cli->cl_mgc_mutex); - -return 0 ; -} -static int mgc_llog_init (const struct lu_env *env,struct obd_device *obd) {struct llog_ctxt *ctxt;
@@ -1131,38 +986,6 @@ int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp,ptlrpc_reconnect_import (imp);return 0 ; } -/* FIXME move this to mgc_process_config */ -if (KEY_IS (KEY_REGISTER_TARGET )) { -struct mgs_target_info *mti; -if (vallen !=sizeof (struct mgs_target_info )) -return -EINVAL ; - mti = (struct mgs_target_info *)val; -CDEBUG (D_MGC ,"register_target %s %#x\n" , - mti->mti_svname, mti->mti_flags); - rc =mgc_target_register (exp, mti); -return rc; - } -if (KEY_IS (KEY_SET_FS )) { -struct super_block *sb = (struct super_block *)val; - -if (vallen !=sizeof (struct super_block )) -return -EINVAL ; - - rc =mgc_fs_setup (exp->exp_obd, sb); -if (rc) -CERROR ("set_fs got %d\n" , rc); - -return rc; - } -if (KEY_IS (KEY_CLEAR_FS )) { -if (vallen !=0 ) -return -EINVAL ; - rc =mgc_fs_cleanup (exp->exp_obd); -if (rc) -CERROR ("clear_fs got %d\n" , rc); - -return rc; - }if (KEY_IS (KEY_SET_INFO )) {struct mgs_send_param *msp;
Signature · 1 line
1.9.3
PATCH 9/12 staging/lustre/obdclass: remove llog_test.ko
In reply to Oleg DrokinFrom: "John L. Hammond" <[email protected]>
The llog_test module requires server support (it needs a local MGS to function) and should not have been included.
--- drivers/staging/lustre/lustre/obdclass/Makefile | 2 +- drivers/staging/lustre/lustre/obdclass/llog_test.c | 1072 -------------------- 2 files changed, 1 insertion(+), 1073 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_test.c
drivers/staging/lustre/lustre/obdclass/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-$(CONFIG_LUSTRE_FS) += obdclass.o llog_test.o +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 \
drivers/staging/lustre/lustre/obdclass/llog_test.c deleted +0 -1072
1,072 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH 10/12 staging/lustre/obdclass: remove llog_osd.c
In reply to Oleg DrokinFrom: "John L. Hammond" <[email protected]>
llog_osd_ops is not used so remove it and its supporting methods.
--- drivers/staging/lustre/lustre/include/lustre_log.h | 9 - drivers/staging/lustre/lustre/obdclass/Makefile | 2 +- drivers/staging/lustre/lustre/obdclass/llog_osd.c | 1290 -------------------- 3 files changed, 1 insertion(+), 1300 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_osd.c
drivers/staging/lustre/lustre/include/lustre_log.h +0 -9
@@ -313,15 +313,6 @@ struct llog_handle {atomic_t lgh_refcount; }; -/* llog_osd.c */ -extern struct llog_operations llog_osd_ops; -int llog_osd_get_cat_list (const struct lu_env *env,struct dt_device *d, -int idx,int count, -struct llog_catid *idarray); -int llog_osd_put_cat_list (const struct lu_env *env,struct dt_device *d, -int idx,int count, -struct llog_catid *idarray); -#define LLOG_CTXT_FLAG_UNINITIALIZED 0x00000001#define LLOG_CTXT_FLAG_STOP 0x00000002
drivers/staging/lustre/lustre/obdclass/Makefile +1 -1
@@ -3,7 +3,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 \ - lustre_handles.o lustre_peer.o llog_osd.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 \ cl_page.o cl_lock.o cl_io.o lu_ref.o acl.o
drivers/staging/lustre/lustre/obdclass/llog_osd.c deleted +0 -1290
1,290 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH 11/12 staging/lustre/mdc: remove obsolete llog ioctl handlers
In reply to Oleg DrokinFrom: "John L. Hammond" <[email protected]>
In mdc_iocontrol() remove the handlers for the obsolete llog ioctls OBD_IOC_PARSE, OBD_IOC_LLOG_INFO, and OBD_IOC_LLOG_PRINT.
--- drivers/staging/lustre/lustre/mdc/mdc_request.c | 15 --------------- 1 file changed, 15 deletions(-)
drivers/staging/lustre/lustre/mdc/mdc_request.c +0 -15
@@ -1830,7 +1830,6 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,struct obd_device *obd = exp->exp_obd;struct obd_ioctl_data *data = karg;struct obd_import *imp = obd->u.cli.cl_import; -struct llog_ctxt *ctxt;int rc;if (!try_module_get (THIS_MODULE )) {
@@ -1886,20 +1885,6 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,case IOC_OSC_SET_ACTIVE : rc =ptlrpc_set_import_active (imp, data->ioc_offset); goto out; -case OBD_IOC_PARSE : { - ctxt =llog_get_context (exp->exp_obd,LLOG_CONFIG_REPL_CTXT ); - rc =class_config_parse_llog (NULL , ctxt, data->ioc_inlbuf1, -NULL ); -llog_ctxt_put (ctxt); - goto out; - } -case OBD_IOC_LLOG_INFO : -case OBD_IOC_LLOG_PRINT : { - ctxt =llog_get_context (obd,LLOG_CONFIG_REPL_CTXT ); - rc =llog_ioctl (NULL , ctxt, cmd, data); -llog_ctxt_put (ctxt); - goto out; - }case OBD_IOC_POLL_QUOTACHECK : rc =mdc_quota_poll_check (exp, (struct if_quotacheck *)karg); goto out;
Signature · 1 line
1.9.3
PATCH 12/12 staging/lustre: remove unused som_attrs and hsm_attrs structures
In reply to Oleg DrokinThese structures are only used server-side to parse relevant attributes.
--- .../lustre/lustre/include/lustre/lustre_idl.h | 37 ----------------- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 48 ---------------------- 2 files changed, 85 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -37
@@ -322,43 +322,6 @@ enum lma_incompat {#define LMA_INCOMPAT_SUPP (LMAI_AGENT | LMAI_REMOTE_PARENT)/** -* SOM on-disk attributes stored in a separate xattr. -*/ -struct som_attrs { -/** Bitfield for supported data in this structure. For future use. */ -__u32 som_compat; - -/** Incompat feature list. The supported feature mask is available in -* SOM_INCOMPAT_SUPP */ -__u32 som_incompat; - -/** IO Epoch SOM attributes belongs to */ -__u64 som_ioepoch; -/** total file size in objects */ -__u64 som_size; -/** total fs blocks in objects */ -__u64 som_blocks; -/** mds mount id the size is valid for */ -__u64 som_mountid; -}; -#define SOM_INCOMPAT_SUPP 0x0 - -/** -* HSM on-disk attributes stored in a separate xattr. -*/ -struct hsm_attrs { -/** Bitfield for supported data in this structure. For future use. */ -__u32 hsm_compat; - -/** HSM flags, see hsm_flags enum below */ -__u32 hsm_flags; -/** backend archive id associated with the file */ -__u64 hsm_arch_id; -/** version associated with the last archiving, if any */ -__u64 hsm_arch_ver; -}; - -/** * fid constants */ enum {
drivers/staging/lustre/lustre/ptlrpc/wiretest.c +0 -48
54 lines not on this page · raw message
Signature · 1 line
1.9.3