From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZo2TDq8+1tHK5M58Nus+elrclJX0kl594DOqJRggbwDZnwpDKw3XSKleAgtBQFVmpsmN0d9 ARC-Seal: i=1; a=rsa-sha256; t=1525146818; cv=none; d=google.com; s=arc-20160816; b=dih93eQRWlmHaYJTIr+tbCC/UKi7lWOVKp93It+YEYXj/UZkiZomVUMTPB++Ujlqpe StvrgOp9KDUKmyl75Z9Y74p4fHRXms3w70haOIbzNqoKOluoNdPrO2jynxIvAgjRqyBc j3xKlo6p2OJtU9eYowlAlYvAmo0ENNjvu7tg+HjAl1rT1JDKXjQgP27DP/jbgy2eOkUN x8Ac2B3Hhcs0rd6W8IR6DlanRYODMNBeETUzqufgnl6pXT6lIaMHqqYy/qb/feIxruuR BEn8QMRLKwfKvUTbAOjbcuBT9oU+/YymqiPgzV96rie1fI86kCASk1pMwEwHeapmmaHS mynA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:cc:subject:date:to:from :arc-authentication-results; bh=ElYuDjiU/1d9muKnlYt4RGRaxZ/J+eXcXFKVcmp6ouA=; b=iFE8tx+v1ja+IYu6UHYCIrRa/PPcucvwvcJZQA7cMMQNK92oYfiEwJRXBD4ilISIWN 4nui48IlYm9q5fJLaGWLXJ6d+jhP+VlWaOUfLsR0jARwo2Sey9cylCCP9VHyWS/El91Z VjM5fnqFPuFoYzd0yPh//8MYNJ5J9HqAum424MchKpxdKKT3tLRmPBo+B1NCiAadgAZz cIHzFuTBD1folrauZlK/r3+SAiz172O15BwL33qAPeCVSLxnW33rmhGwiDO6+Flb7PeG A2ScfCtTeGv6R12w8ftNKkfi2m+0egJdN/edlnZDQWVaulcgxi3ZNqCrowXy+RqANOLS kQhg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of neilb@suse.com designates 195.135.220.15 as permitted sender) smtp.mailfrom=neilb@suse.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of neilb@suse.com designates 195.135.220.15 as permitted sender) smtp.mailfrom=neilb@suse.com From: NeilBrown To: Oleg Drokin , Greg Kroah-Hartman , James Simmons , Andreas Dilger Date: Tue, 01 May 2018 13:52:39 +1000 Subject: [PATCH 05/10] staging: lustre: fold lu_object_new() into lu_object_find_at() Cc: Linux Kernel Mailing List , Lustre Development List Message-ID: <152514675900.17843.13720388713238865482.stgit@noble> In-Reply-To: <152514658325.17843.11455067361317157487.stgit@noble> References: <152514658325.17843.11455067361317157487.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1599232350077764405?= X-GMAIL-MSGID: =?utf-8?q?1599232350077764405?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 --- drivers/staging/lustre/lustre/obdclass/lu_object.c | 44 +++++--------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c index 93daa52e2535..9721b3af8ea8 100644 --- a/drivers/staging/lustre/lustre/obdclass/lu_object.c +++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c @@ -678,29 +678,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 @@ -736,18 +713,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, 0); - o = htable_lookup(s, &bd, f, &version); - cfs_hash_bd_unlock(hs, &bd, 0); - 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, 0); + o = htable_lookup(s, &bd, f, &version); + cfs_hash_bd_unlock(hs, &bd, 0); + 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. @@ -760,7 +737,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);