mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: James Simmons <jsimmons@infradead.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	devel@driverdev.osuosl.org,
	Andreas Dilger <andreas.dilger@intel.com>,
	Oleg Drokin <oleg.drokin@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Lustre Development List <lustre-devel@lists.lustre.org>,
	Swapnil Pimpale <spimpale@ddn.com>,
	James Simmons <jsimons@infradead.org>
Subject: [PATCH 09/17] staging: lustre: ptlrpc: return a meaningful status from ptlrpcd_init()
Date: Sun, 10 Apr 2016 09:13:32 -0400	[thread overview]
Message-ID: <1460294020-2111-10-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1460294020-2111-1-git-send-email-jsimmons@infradead.org>

From: Swapnil Pimpale <spimpale@ddn.com>

This patch has the following:
1) Fix for the return value from ptlrpcd_init(). It will now return a
   correct status instead of returning zero always.
2) ptlrpcd_addref() should not increment ptlrpcd_users on error.
3) Added code in a mdc_setup() and mgc_setup() to test the return
   value of ptlrpcd_addref() and return on error.

Signed-off-by: Swapnil Pimpale <spimpale@ddn.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3808
Reviewed-on: http://review.whamcloud.com/7522
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: James Simmons <jsimons@infradead.org>
---
 drivers/staging/lustre/lustre/mdc/mdc_request.c |    9 ++++++---
 drivers/staging/lustre/lustre/mgc/mgc_request.c |    5 ++++-
 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c  |    5 ++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index a089237..97f8669 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -2314,12 +2314,14 @@ static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
 		return -ENOMEM;
 	mdc_init_rpc_lock(cli->cl_rpc_lock);
 
-	ptlrpcd_addref();
+	rc = ptlrpcd_addref();
+	if (rc < 0)
+		goto err_rpc_lock;
 
 	cli->cl_close_lock = kzalloc(sizeof(*cli->cl_close_lock), GFP_NOFS);
 	if (!cli->cl_close_lock) {
 		rc = -ENOMEM;
-		goto err_rpc_lock;
+		goto err_ptlrpcd_decref;
 	}
 	mdc_init_rpc_lock(cli->cl_close_lock);
 
@@ -2345,9 +2347,10 @@ static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
 
 err_close_lock:
 	kfree(cli->cl_close_lock);
+err_ptlrpcd_decref:
+	ptlrpcd_decref();
 err_rpc_lock:
 	kfree(cli->cl_rpc_lock);
-	ptlrpcd_decref();
 	return rc;
 }
 
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index b7dc872..3f5f884 100644
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -734,7 +734,9 @@ static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 	struct task_struct *task;
 	int rc;
 
-	ptlrpcd_addref();
+	rc = ptlrpcd_addref();
+	if (rc < 0)
+		goto err_noref;
 
 	rc = client_obd_setup(obd, lcfg);
 	if (rc)
@@ -773,6 +775,7 @@ err_cleanup:
 	client_obd_cleanup(obd);
 err_decref:
 	ptlrpcd_decref();
+err_noref:
 	return rc;
 }
 
diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c b/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
index dbc3376..76a355a 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
@@ -909,8 +909,11 @@ int ptlrpcd_addref(void)
 	int rc = 0;
 
 	mutex_lock(&ptlrpcd_mutex);
-	if (++ptlrpcd_users == 1)
+	if (++ptlrpcd_users == 1) {
 		rc = ptlrpcd_init();
+		if (rc < 0)
+			ptlrpcd_users--;
+	}
 	mutex_unlock(&ptlrpcd_mutex);
 	return rc;
 }
-- 
1.7.1

  parent reply	other threads:[~2016-04-10 13:14 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-10 13:13 [PATCH 00/17] staging : lustre : rest of missing patches from 2.5.0 release James Simmons
2016-04-10 13:13 ` [PATCH 01/17] staging: lustre: osc: fix race issues thanks to oap_lock James Simmons
2016-04-12  4:05   ` Greg Kroah-Hartman
2016-04-10 13:13 ` [PATCH 02/17] staging: lustre: clio: incorrect assertions in 'enable-invariants' James Simmons
2016-04-10 13:13 ` [PATCH 03/17] staging: lustre: ldlm: Fix a race during FLock handling James Simmons
2016-04-10 13:13 ` [PATCH 04/17] staging: lustre: ldlm: refine LU-2665 patch for POSIX compliance James Simmons
2016-04-10 13:13 ` [PATCH 05/17] staging: lustre: llite: variable rename in namei.c James Simmons
2016-04-10 13:13 ` [PATCH 06/17] staging: lustre: llite: speedup in unlink/rmdir James Simmons
2016-04-10 13:13 ` [PATCH 07/17] staging: lustre: llite: error setting max_cache_mb at mount time James Simmons
2016-04-10 13:13 ` [PATCH 08/17] staging: lustre: obd: MDT mount fails on MDS w/o MGS on it James Simmons
2016-04-10 13:13 ` James Simmons [this message]
2016-04-10 13:13 ` [PATCH 10/17] staging: lustre: llite: Truncate to restore file James Simmons
2016-04-10 13:13 ` [PATCH 11/17] staging: lustre: osc: osc_extent_wait() shouldn't be interruptible James Simmons
2016-04-10 13:13 ` [PATCH 12/17] staging: lustre: lprocfs: implement log2 using bitops James Simmons
2016-04-10 13:13 ` [PATCH 13/17] staging: lustre: lloop: Fix build failure on ppc64 James Simmons
2016-04-10 13:22   ` Jeff Mahoney
2016-04-10 14:04     ` James Simmons
2016-04-10 15:35       ` Greg Kroah-Hartman
2016-04-10 15:52         ` James Simmons
2016-04-10 21:13       ` Jeff Mahoney
2016-04-10 13:13 ` [PATCH 14/17] staging: lustre: lov: return minimal FIEMAP for released files James Simmons
2016-04-10 13:13 ` [PATCH 15/17] staging: lustre: lov: Don't wait for active target with OBD_STATFS_NODELAY James Simmons
2016-04-10 13:13 ` [PATCH 16/17] staging: lustre: hsm: permission checks for HSM ioctl operations James Simmons
2016-04-10 13:13 ` [PATCH 17/17] staging: lustre: hsm: don't use real suppgid James Simmons

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=1460294020-2111-10-git-send-email-jsimmons@infradead.org \
    --to=jsimmons@infradead.org \
    --cc=andreas.dilger@intel.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jsimons@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lustre-devel@lists.lustre.org \
    --cc=oleg.drokin@intel.com \
    --cc=spimpale@ddn.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®