From: "Dilger, Andreas" <andreas.dilger@intel.com>
To: NeilBrown <neilb@suse.com>
Cc: "Drokin, Oleg" <oleg.drokin@intel.com>,
James Simmons <jsimmons@infradead.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"lustre-devel@lists.lustre.org" <lustre-devel@lists.lustre.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/9] staging: lustre: ldlm: remove unneeded 'err' arg to ldlm_process_flock_lock()
Date: Fri, 27 Oct 2017 09:11:55 +0000 [thread overview]
Message-ID: <848A263F-507D-4931-A6A0-F16709C05A30@intel.com> (raw)
In-Reply-To: <150872002965.3340.8937896457096417746.stgit@noble>
On Oct 22, 2017, at 18:53, NeilBrown <neilb@suse.com> 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 <neilb@suse.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
> ---
> 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
next prev parent reply other threads:[~2017-10-27 9:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-23 0:53 [PATCH 0/9] Assorted cleanups for staging/.../lustre/ldlm/ldlm_flock.c NeilBrown
2017-10-23 0:53 ` [PATCH 2/9] staging: lustre: ldlm: remove unused 'work_list' arg from ldlm_process_flock_lock() NeilBrown
2017-10-27 9:09 ` Dilger, Andreas
2017-10-23 0:53 ` [PATCH 4/9] staging: lustre: ldlm: remove 'flags' " NeilBrown
2017-10-27 9:19 ` Dilger, Andreas
2017-10-23 0:53 ` [PATCH 1/9] staging: lustre: ldlm: remove 'first_enq' " NeilBrown
2017-10-27 9:08 ` Dilger, Andreas
2017-10-23 0:53 ` [PATCH 3/9] staging: lustre: ldlm: remove unneeded 'err' arg to ldlm_process_flock_lock() NeilBrown
2017-10-27 9:11 ` Dilger, Andreas [this message]
2017-10-23 0:53 ` [PATCH 9/9] staging: lustre: ldlm: remove unused field 'fwd_generation' NeilBrown
2017-10-27 9:39 ` [lustre-devel] " Dilger, Andreas
2017-10-27 11:10 ` NeilBrown
2017-10-23 0:53 ` [PATCH 5/9] staging: lustre: ldlm: remove unused 'overlaps' variable NeilBrown
2017-10-27 9:20 ` Dilger, Andreas
2017-10-23 0:53 ` [PATCH 7/9] staging: lustre: ldlm: tidy list walking in ldlm_flock() NeilBrown
2017-10-27 9:32 ` Dilger, Andreas
2017-10-23 0:53 ` [PATCH 8/9] staging: lustre: ldlm: remove unnecessary 'ownlocks' variable NeilBrown
2017-10-27 9:33 ` Dilger, Andreas
2017-10-23 0:53 ` [PATCH 6/9] staging: lustre: ldlm: remove 'flags' arg from ldlm_flock_destroy() NeilBrown
2017-10-27 9:23 ` Dilger, Andreas
2017-10-24 22:20 ` [PATCH 0/9] Assorted cleanups for staging/.../lustre/ldlm/ldlm_flock.c James Simmons
2017-10-25 21:55 ` NeilBrown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=848A263F-507D-4931-A6A0-F16709C05A30@intel.com \
--to=andreas.dilger@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jsimmons@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=neilb@suse.com \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®