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: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c
index 32a593a0858a6bee683d987a0be975447b2f8dcc..f14e3509f059d7c8124407c0e2f6c194d3ac27d5 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c
@@ -682,29 +682,6 @@ static void lu_object_limit(const struct lu_env *env, struct lu_device *dev)
                              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
  * \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.
         *
         */
-       if (conf && conf->loc_flags & LOC_F_NEW)
-               return lu_object_new(env, dev, f, conf);
-
        s  = dev->ld_site;
        hs = s->ls_obj_hash;
-       cfs_hash_bd_get_and_lock(hs, (void *)f, &bd, 1);
-       o = htable_lookup(s, &bd, f, &version);
-       cfs_hash_bd_unlock(hs, &bd, 1);
 
-       if (!IS_ERR(o) || PTR_ERR(o) != -ENOENT)
-               return o;
+       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);
+               cfs_hash_bd_unlock(hs, &bd, 1);
 
+               if (!IS_ERR(o) || PTR_ERR(o) != -ENOENT)
+                       return o;
+       }
        /*
         * Allocate new object. This may result in rather complicated
         * operations, including fld queries, inode loading, etc.
@@ -764,7 +741,10 @@ struct lu_object *lu_object_find_at(const struct lu_env *env,
 
        cfs_hash_bd_lock(hs, &bd, 1);
 
-       shadow = htable_lookup(s, &bd, f, &version);
+       if (conf && conf->loc_flags & LOC_F_NEW)
+               shadow = ERR_PTR(-ENOENT);
+       else
+               shadow = htable_lookup(s, &bd, f, &version);
        if (likely(PTR_ERR(shadow) == -ENOENT)) {
                cfs_hash_bd_add_locked(hs, &bd, &o->lo_header->loh_hash);
                cfs_hash_bd_unlock(hs, &bd, 1);