aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGulsah Kose <gulsah.1004@gmail.com>2014-09-20 14:39:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-19 20:37:16 -0400
commit8ad5360ad81a32b4e9fdc956e7c453308050a97d (patch)
tree20a3496b7a8964d9166693b7977fec35d2ebf812
parent70b694c32e405cff8e2640b3943ed9598d97f75e (diff)
staging: lustre: lnet: lnet: Fixed quoted string split warning.
This patch fixes "quoted string split across lines" checkpatch.pl warning in api-ni.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lnet/lnet/api-ni.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index f70d0f346750..03db6ab98ff9 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -73,8 +73,7 @@ lnet_get_networks(void)
73 int rc; 73 int rc;
74 74
75 if (*networks != 0 && *ip2nets != 0) { 75 if (*networks != 0 && *ip2nets != 0) {
76 LCONSOLE_ERROR_MSG(0x101, "Please specify EITHER 'networks' or " 76 LCONSOLE_ERROR_MSG(0x101, "Please specify EITHER 'networks' or 'ip2nets' but not both at once\n");
77 "'ip2nets' but not both at once\n");
78 return NULL; 77 return NULL;
79 } 78 }
80 79
@@ -1097,8 +1096,7 @@ lnet_startup_lndnis (void)
1097 LNET_MUTEX_UNLOCK(&the_lnet.ln_lnd_mutex); 1096 LNET_MUTEX_UNLOCK(&the_lnet.ln_lnd_mutex);
1098 1097
1099 if (rc != 0) { 1098 if (rc != 0) {
1100 LCONSOLE_ERROR_MSG(0x105, "Error %d starting up LNI %s" 1099 LCONSOLE_ERROR_MSG(0x105, "Error %d starting up LNI %s\n",
1101 "\n",
1102 rc, libcfs_lnd2str(lnd->lnd_type)); 1100 rc, libcfs_lnd2str(lnd->lnd_type));
1103 lnet_net_lock(LNET_LOCK_EX); 1101 lnet_net_lock(LNET_LOCK_EX);
1104 lnd->lnd_refcount--; 1102 lnd->lnd_refcount--;
@@ -1154,8 +1152,7 @@ lnet_startup_lndnis (void)
1154 1152
1155 if (the_lnet.ln_eq_waitni != NULL && nicount > 1) { 1153 if (the_lnet.ln_eq_waitni != NULL && nicount > 1) {
1156 lnd_type = the_lnet.ln_eq_waitni->ni_lnd->lnd_type; 1154 lnd_type = the_lnet.ln_eq_waitni->ni_lnd->lnd_type;
1157 LCONSOLE_ERROR_MSG(0x109, "LND %s can only run single-network" 1155 LCONSOLE_ERROR_MSG(0x109, "LND %s can only run single-network\n",
1158 "\n",
1159 libcfs_lnd2str(lnd_type)); 1156 libcfs_lnd2str(lnd_type));
1160 goto failed; 1157 goto failed;
1161 } 1158 }
@@ -1201,8 +1198,7 @@ LNetInit(void)
1201 LASSERT(the_lnet.ln_cpt_number > 0); 1198 LASSERT(the_lnet.ln_cpt_number > 0);
1202 if (the_lnet.ln_cpt_number > LNET_CPT_MAX) { 1199 if (the_lnet.ln_cpt_number > LNET_CPT_MAX) {
1203 /* we are under risk of consuming all lh_cookie */ 1200 /* we are under risk of consuming all lh_cookie */
1204 CERROR("Can't have %d CPTs for LNet (max allowed is %d), " 1201 CERROR("Can't have %d CPTs for LNet (max allowed is %d), please change setting of CPT-table and retry\n",
1205 "please change setting of CPT-table and retry\n",
1206 the_lnet.ln_cpt_number, LNET_CPT_MAX); 1202 the_lnet.ln_cpt_number, LNET_CPT_MAX);
1207 return -1; 1203 return -1;
1208 } 1204 }