Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51a1c380 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lov: remove unused lov obd functions 



Remove the unused lov functions lov_get_reqset,
lov_check_index_in_pool, and lov_find_pool functions.
Remove unused data structures.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/5581


Reviewed-by: default avatarAlex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ebde64c0

drivers/staging/lustre/lustre/lov/lov_ea.c

+0 −5
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ 


#include "lov_internal.h"



struct lovea_unpack_args {

	struct lov_stripe_md *lsm;

	int		   cursor;

};



static int lsm_lmm_verify_common(struct lov_mds_md *lmm, int lmm_bytes,

				 __u16 stripe_count)

{

drivers/staging/lustre/lustre/lov/lov_internal.h

+0 −11
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ struct lov_request { 
};



struct lov_request_set {

	struct ldlm_enqueue_info	*set_ei;

	struct obd_info			*set_oi;

	atomic_t			set_refcount;

	struct obd_export		*set_exp;
@@ -117,10 +116,8 @@ struct lov_request_set { 
	atomic_t			set_finish_checked;

	struct llog_cookie		*set_cookies;

	int				set_cookie_sent;

	struct obd_trans_info		*set_oti;

	struct list_head			set_list;

	wait_queue_head_t			set_waitq;

	spinlock_t			set_lock;

};



extern struct kmem_cache *lov_oinfo_slab;
@@ -129,12 +126,6 @@ extern struct lu_kmem_descr lov_caches[]; 


void lov_finish_set(struct lov_request_set *set);



static inline void lov_get_reqset(struct lov_request_set *set)

{

	LASSERT(atomic_read(&set->set_refcount) > 0);

	atomic_inc(&set->set_refcount);

}



static inline void lov_put_reqset(struct lov_request_set *set)

{

	if (atomic_dec_and_test(&set->set_refcount))
@@ -246,8 +237,6 @@ int lov_pool_new(struct obd_device *obd, char *poolname); 
int lov_pool_del(struct obd_device *obd, char *poolname);

int lov_pool_add(struct obd_device *obd, char *poolname, char *ostname);

int lov_pool_remove(struct obd_device *obd, char *poolname, char *ostname);

struct pool_desc *lov_find_pool(struct lov_obd *lov, char *poolname);

int lov_check_index_in_pool(__u32 idx, struct pool_desc *pool);

void lov_pool_putref(struct pool_desc *pool);



static inline struct lov_stripe_md *lsm_addref(struct lov_stripe_md *lsm)

drivers/staging/lustre/lustre/lov/lov_obd.c

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ static int lov_set_osc_active(struct obd_device *obd, struct obd_uuid *uuid, 
static int lov_notify(struct obd_device *obd, struct obd_device *watched,

		      enum obd_notify_event ev, void *data);



#define MAX_STRING_SIZE 128

int lov_connect_obd(struct obd_device *obd, __u32 index, int activate,

		    struct obd_connect_data *data)

{

drivers/staging/lustre/lustre/lov/lov_pool.c

+0 −47
Original line number Diff line number Diff line
@@ -586,50 +586,3 @@ int lov_pool_remove(struct obd_device *obd, char *poolname, char *ostname) 
	lov_pool_putref(pool);

	return rc;

}
 


int lov_check_index_in_pool(__u32 idx, struct pool_desc *pool)

{

	int i, rc;



	/* caller may no have a ref on pool if it got the pool

	 * without calling lov_find_pool() (e.g. go through the lov pool

	 * list)

	 */

	lov_pool_getref(pool);



	down_read(&pool_tgt_rw_sem(pool));



	for (i = 0; i < pool_tgt_count(pool); i++) {

		if (pool_tgt_array(pool)[i] == idx) {

			rc = 0;

			goto out;

		}

	}

	rc = -ENOENT;

out:

	up_read(&pool_tgt_rw_sem(pool));



	lov_pool_putref(pool);

	return rc;

}



struct pool_desc *lov_find_pool(struct lov_obd *lov, char *poolname)

{

	struct pool_desc *pool;



	pool = NULL;

	if (poolname[0] != '\0') {

		pool = cfs_hash_lookup(lov->lov_pools_hash_body, poolname);

		if (!pool)

			CWARN("Request for an unknown pool ("LOV_POOLNAMEF")\n",

			      poolname);

		if (pool && (pool_tgt_count(pool) == 0)) {

			CWARN("Request for an empty pool ("LOV_POOLNAMEF")\n",

			      poolname);

			/* pool is ignored, so we remove ref on it */

			lov_pool_putref(pool);

			pool = NULL;

		}

	}

	return pool;

}

drivers/staging/lustre/lustre/lov/lov_request.c

+0 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ static void lov_init_set(struct lov_request_set *set) 
	INIT_LIST_HEAD(&set->set_list);

	atomic_set(&set->set_refcount, 1);

	init_waitqueue_head(&set->set_waitq);

	spin_lock_init(&set->set_lock);

}



void lov_finish_set(struct lov_request_set *set)
@@ -362,7 +361,6 @@ int lov_prep_destroy_set(struct obd_export *exp, struct obd_info *oinfo, 
	set->set_oi = oinfo;

	set->set_oi->oi_md = lsm;

	set->set_oi->oi_oa = src_oa;

	set->set_oti = oti;

	if (oti && src_oa->o_valid & OBD_MD_FLCOOKIE)

		set->set_cookies = oti->oti_logcookies;
@@ -479,7 +477,6 @@ int lov_prep_setattr_set(struct obd_export *exp, struct obd_info *oinfo, 
	lov_init_set(set);



	set->set_exp = exp;

	set->set_oti = oti;

	set->set_oi = oinfo;

	if (oti && oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE)

		set->set_cookies = oti->oti_logcookies;