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

Commit 775c4dc2 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: fold lu_object_new() into lu_object_find_at() 



lu_object_new() duplicates a lot of code that is in
lu_object_find_at().
There is no real need for a separate function, it is simpler just
to skip the bits of lu_object_find_at() that we don't
want in the LOC_F_NEW case.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bab8b4cc

drivers/staging/lustre/lustre/obdclass/lu_object.c

+12 −32
Original line number Original line Diff line number Diff line
@@ -682,29 +682,6 @@ static void lu_object_limit(const struct lu_env *env, struct lu_device *dev) 
			      false);

			      false);

}

}





static struct lu_object *lu_object_new(const struct lu_env *env,

				       struct lu_device *dev,

				       const struct lu_fid *f,

				       const struct lu_object_conf *conf)

{

	struct lu_object	*o;

	struct cfs_hash	      *hs;

	struct cfs_hash_bd	    bd;



	o = lu_object_alloc(env, dev, f, conf);

	if (IS_ERR(o))

		return o;



	hs = dev->ld_site->ls_obj_hash;

	cfs_hash_bd_get_and_lock(hs, (void *)f, &bd, 1);

	cfs_hash_bd_add_locked(hs, &bd, &o->lo_header->loh_hash);

	cfs_hash_bd_unlock(hs, &bd, 1);



	lu_object_limit(env, dev);



	return o;

}



/**

/**

 * Much like lu_object_find(), but top level device of object is specifically

 * Much like lu_object_find(), but top level device of object is specifically

 * \a dev rather than top level device of the site. This interface allows

 * \a dev rather than top level device of the site. This interface allows
@@ -740,18 +717,18 @@ struct lu_object *lu_object_find_at(const struct lu_env *env, 
	 * just alloc and insert directly.

	 * just alloc and insert directly.

	 *

	 *

	 */

	 */

	if (conf && conf->loc_flags & LOC_F_NEW)

		return lu_object_new(env, dev, f, conf);



	s  = dev->ld_site;

	s  = dev->ld_site;

	hs = s->ls_obj_hash;

	hs = s->ls_obj_hash;

	cfs_hash_bd_get_and_lock(hs, (void *)f, &bd, 1);



	cfs_hash_bd_get(hs, f, &bd);

	if (!(conf && conf->loc_flags & LOC_F_NEW)) {

		cfs_hash_bd_lock(hs, &bd, 1);

		o = htable_lookup(s, &bd, f, &version);

		o = htable_lookup(s, &bd, f, &version);

		cfs_hash_bd_unlock(hs, &bd, 1);

		cfs_hash_bd_unlock(hs, &bd, 1);





		if (!IS_ERR(o) || PTR_ERR(o) != -ENOENT)

		if (!IS_ERR(o) || PTR_ERR(o) != -ENOENT)

			return o;

			return o;



	}

	/*

	/*

	 * Allocate new object. This may result in rather complicated

	 * Allocate new object. This may result in rather complicated

	 * operations, including fld queries, inode loading, etc.

	 * operations, including fld queries, inode loading, etc.
@@ -764,6 +741,9 @@ struct lu_object *lu_object_find_at(const struct lu_env *env, 




	cfs_hash_bd_lock(hs, &bd, 1);

	cfs_hash_bd_lock(hs, &bd, 1);





	if (conf && conf->loc_flags & LOC_F_NEW)

		shadow = ERR_PTR(-ENOENT);

	else

		shadow = htable_lookup(s, &bd, f, &version);

		shadow = htable_lookup(s, &bd, f, &version);

	if (likely(PTR_ERR(shadow) == -ENOENT)) {

	if (likely(PTR_ERR(shadow) == -ENOENT)) {

		cfs_hash_bd_add_locked(hs, &bd, &o->lo_header->loh_hash);

		cfs_hash_bd_add_locked(hs, &bd, &o->lo_header->loh_hash);