From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752187AbdJ0JMB convert rfc822-to-8bit (ORCPT ); Fri, 27 Oct 2017 05:12:01 -0400 Received: from mga06.intel.com ([134.134.136.31]:56334 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148AbdJ0JL5 (ORCPT ); Fri, 27 Oct 2017 05:11:57 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,304,1505804400"; d="scan'208";a="1235996303" From: "Dilger, Andreas" To: NeilBrown CC: "Drokin, Oleg" , James Simmons , Greg Kroah-Hartman , "lustre-devel@lists.lustre.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 3/9] staging: lustre: ldlm: remove unneeded 'err' arg to ldlm_process_flock_lock() Thread-Topic: [PATCH 3/9] staging: lustre: ldlm: remove unneeded 'err' arg to ldlm_process_flock_lock() Thread-Index: AQHTS5meJialcqaA9UG5eot7udFfYqL35WeA Date: Fri, 27 Oct 2017 09:11:55 +0000 Message-ID: <848A263F-507D-4931-A6A0-F16709C05A30@intel.com> References: <150871988297.3340.4522589460981284121.stgit@noble> <150872002965.3340.8937896457096417746.stgit@noble> In-Reply-To: <150872002965.3340.8937896457096417746.stgit@noble> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.254.7.56] Content-Type: text/plain; charset="us-ascii" Content-ID: <5AE61A3A2343BF4F945434471DCFBB7F@intel.com> Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Oct 22, 2017, at 18:53, NeilBrown wrote: > > This arg is used to return an error code, but the returned code is never > looked at. So there is no point returning it. > > Signed-off-by: NeilBrown Reviewed-by: Andreas Dilger > --- > drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c > index 766653b4d8a5..05e6b67b0e72 100644 > --- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c > +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c > @@ -122,8 +122,7 @@ ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode, __u64 flags) > * is released. > * > */ > -static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, > - enum ldlm_error *err) > +static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags) > { > struct ldlm_resource *res = req->l_resource; > struct ldlm_namespace *ns = ldlm_res_to_ns(res); > @@ -145,8 +144,6 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, > req->l_policy_data.l_flock.start, > req->l_policy_data.l_flock.end); > > - *err = ELDLM_OK; > - > /* No blocking ASTs are sent to the clients for > * Posix file & record locks > */ > @@ -192,7 +189,6 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, > > if (*flags & LDLM_FL_BLOCK_NOWAIT) { > ldlm_flock_destroy(req, mode, *flags); > - *err = -EAGAIN; > return LDLM_ITER_STOP; > } > > @@ -330,7 +326,6 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, > if (IS_ERR(new2)) { > ldlm_flock_destroy(req, lock->l_granted_mode, > *flags); > - *err = PTR_ERR(new2); > return LDLM_ITER_STOP; > } > goto reprocess; > @@ -440,7 +435,6 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) > struct obd_import *imp = NULL; > struct ldlm_flock_wait_data fwd; > struct l_wait_info lwi; > - enum ldlm_error err; > int rc = 0; > > OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_CP_CB_WAIT2, 4); > @@ -593,7 +587,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) > /* We need to reprocess the lock to do merges or splits > * with existing locks owned by this process. > */ > - ldlm_process_flock_lock(lock, &noreproc, &err); > + ldlm_process_flock_lock(lock, &noreproc); > } > unlock_res_and_lock(lock); > return rc; > > Cheers, Andreas -- Andreas Dilger Lustre Principal Architect Intel Corporation