* [PATCH] qlge: call ql_core_dump() only if dump memory was allocated.
@ 2013-09-20 15:30 Malahal Naineni
2013-09-20 16:02 ` David Miller
0 siblings, 1 reply; 7+ messages in thread
From: Malahal Naineni @ 2013-09-20 15:30 UTC (permalink / raw)
To: netdev
Also changed a log message to indicate that memory was not allocated
instead of memory not available!
---
drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 4 ++--
drivers/net/ethernet/qlogic/qlge/qlge_mpi.c | 12 +++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
index 10093f0..6bc5db7 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
@@ -740,8 +740,8 @@ int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump)
int i;
if (!mpi_coredump) {
- netif_err(qdev, drv, qdev->ndev, "No memory available\n");
- return -ENOMEM;
+ netif_err(qdev, drv, qdev->ndev, "No memory allocated\n");
+ return -EINVAL;
}
/* Try to get the spinlock, but dont worry if
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
index ff2bf8a..99a3e07 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
@@ -1274,11 +1274,13 @@ void ql_mpi_reset_work(struct work_struct *work)
return;
}
- if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
- netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
- qdev->core_is_dumped = 1;
- queue_delayed_work(qdev->workqueue,
- &qdev->mpi_core_to_log, 5 * HZ);
+ if (qdev->mpi_coredump) {
+ if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
+ netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
+ qdev->core_is_dumped = 1;
+ queue_delayed_work(qdev->workqueue,
+ &qdev->mpi_core_to_log, 5 * HZ);
+ }
}
ql_soft_reset_mpi_risc(qdev);
}
--
1.7.11.7
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] qlge: call ql_core_dump() only if dump memory was allocated.
2013-09-20 15:30 [PATCH] qlge: call ql_core_dump() only if dump memory was allocated Malahal Naineni
@ 2013-09-20 16:02 ` David Miller
2013-09-20 16:59 ` Malahal Naineni
0 siblings, 1 reply; 7+ messages in thread
From: David Miller @ 2013-09-20 16:02 UTC (permalink / raw)
To: malahal; +Cc: netdev
From: Malahal Naineni <malahal@us.ibm.com>
Date: Fri, 20 Sep 2013 10:30:31 -0500
> Also changed a log message to indicate that memory was not allocated
> instead of memory not available!
This change is not submitted properly, in particular it is missing
a signoff.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] qlge: call ql_core_dump() only if dump memory was allocated.
2013-09-20 16:02 ` David Miller
@ 2013-09-20 16:59 ` Malahal Naineni
2013-09-20 18:08 ` Joe Perches
0 siblings, 1 reply; 7+ messages in thread
From: Malahal Naineni @ 2013-09-20 16:59 UTC (permalink / raw)
To: netdev
Also changed a log message to indicate that memory was not allocated
instead of memory not available!
Signed-off-by: Malahal Naineni <malahal@us.ibm.com>
---
drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 4 ++--
drivers/net/ethernet/qlogic/qlge/qlge_mpi.c | 12 +++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
index 10093f0..6bc5db7 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
@@ -740,8 +740,8 @@ int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump)
int i;
if (!mpi_coredump) {
- netif_err(qdev, drv, qdev->ndev, "No memory available\n");
- return -ENOMEM;
+ netif_err(qdev, drv, qdev->ndev, "No memory allocated\n");
+ return -EINVAL;
}
/* Try to get the spinlock, but dont worry if
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
index ff2bf8a..99a3e07 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
@@ -1274,11 +1274,13 @@ void ql_mpi_reset_work(struct work_struct *work)
return;
}
- if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
- netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
- qdev->core_is_dumped = 1;
- queue_delayed_work(qdev->workqueue,
- &qdev->mpi_core_to_log, 5 * HZ);
+ if (qdev->mpi_coredump) {
+ if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
+ netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
+ qdev->core_is_dumped = 1;
+ queue_delayed_work(qdev->workqueue,
+ &qdev->mpi_core_to_log, 5 * HZ);
+ }
}
ql_soft_reset_mpi_risc(qdev);
}
--
1.7.11.7
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] qlge: call ql_core_dump() only if dump memory was allocated.
2013-09-20 16:59 ` Malahal Naineni
@ 2013-09-20 18:08 ` Joe Perches
2013-09-20 18:50 ` David Miller
2013-09-20 18:57 ` Malahal Naineni
0 siblings, 2 replies; 7+ messages in thread
From: Joe Perches @ 2013-09-20 18:08 UTC (permalink / raw)
To: Malahal Naineni; +Cc: netdev
On Fri, 2013-09-20 at 11:59 -0500, Malahal Naineni wrote:
> Also changed a log message to indicate that memory was not allocated
> instead of memory not available!
[]
> diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
[]
> @@ -1274,11 +1274,13 @@ void ql_mpi_reset_work(struct work_struct *work)
> return;
> }
>
> - if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
> - netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
> - qdev->core_is_dumped = 1;
> - queue_delayed_work(qdev->workqueue,
> - &qdev->mpi_core_to_log, 5 * HZ);
> + if (qdev->mpi_coredump) {
> + if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
> + netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
> + qdev->core_is_dumped = 1;
> + queue_delayed_work(qdev->workqueue,
> + &qdev->mpi_core_to_log, 5 * HZ);
> + }
This can be done without adding another indentation level
if (qdev->mpi_coredump &&
!ql_core_dump(qdev, qdev->mpi_coredump)) {
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] qlge: call ql_core_dump() only if dump memory was allocated.
2013-09-20 18:08 ` Joe Perches
@ 2013-09-20 18:50 ` David Miller
2013-09-20 18:57 ` Malahal Naineni
1 sibling, 0 replies; 7+ messages in thread
From: David Miller @ 2013-09-20 18:50 UTC (permalink / raw)
To: joe; +Cc: malahal, netdev
From: Joe Perches <joe@perches.com>
Date: Fri, 20 Sep 2013 11:08:51 -0700
> On Fri, 2013-09-20 at 11:59 -0500, Malahal Naineni wrote:
>> Also changed a log message to indicate that memory was not allocated
>> instead of memory not available!
> []
>> diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
> []
>> @@ -1274,11 +1274,13 @@ void ql_mpi_reset_work(struct work_struct *work)
>> return;
>> }
>>
>> - if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
>> - netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
>> - qdev->core_is_dumped = 1;
>> - queue_delayed_work(qdev->workqueue,
>> - &qdev->mpi_core_to_log, 5 * HZ);
>> + if (qdev->mpi_coredump) {
>> + if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
>> + netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
>> + qdev->core_is_dumped = 1;
>> + queue_delayed_work(qdev->workqueue,
>> + &qdev->mpi_core_to_log, 5 * HZ);
>> + }
>
> This can be done without adding another indentation level
>
> if (qdev->mpi_coredump &&
> !ql_core_dump(qdev, qdev->mpi_coredump)) {
Agreed.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] qlge: call ql_core_dump() only if dump memory was allocated.
2013-09-20 18:08 ` Joe Perches
2013-09-20 18:50 ` David Miller
@ 2013-09-20 18:57 ` Malahal Naineni
2013-09-20 19:00 ` David Miller
1 sibling, 1 reply; 7+ messages in thread
From: Malahal Naineni @ 2013-09-20 18:57 UTC (permalink / raw)
To: Joe Perches; +Cc: netdev
Joe Perches [joe@perches.com] wrote:
> On Fri, 2013-09-20 at 11:59 -0500, Malahal Naineni wrote:
> > Also changed a log message to indicate that memory was not allocated
> > instead of memory not available!
> []
> > diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
> []
> > @@ -1274,11 +1274,13 @@ void ql_mpi_reset_work(struct work_struct *work)
> > return;
> > }
> >
> > - if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
> > - netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
> > - qdev->core_is_dumped = 1;
> > - queue_delayed_work(qdev->workqueue,
> > - &qdev->mpi_core_to_log, 5 * HZ);
> > + if (qdev->mpi_coredump) {
> > + if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
> > + netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
> > + qdev->core_is_dumped = 1;
> > + queue_delayed_work(qdev->workqueue,
> > + &qdev->mpi_core_to_log, 5 * HZ);
> > + }
>
> This can be done without adding another indentation level
>
> if (qdev->mpi_coredump &&
> !ql_core_dump(qdev, qdev->mpi_coredump)) {
>
>
Makes sense! Sending another patch as suggested:
>From b4e1561cb46242c33a77484160f1f1cc3d0e3ffc Mon Sep 17 00:00:00 2001
From: Malahal Naineni <malahal@us.ibm.com>
Date: Fri, 20 Sep 2013 10:18:19 -0500
Subject: [PATCH] qlge: call ql_core_dump() only if dump memory was allocated.
Also changed a log message to indicate that memory was not allocated
instead of memory not available!
Signed-off-by: Malahal Naineni <malahal@us.ibm.com>
---
drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 4 ++--
drivers/net/ethernet/qlogic/qlge/qlge_mpi.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
index 10093f0..6bc5db7 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
@@ -740,8 +740,8 @@ int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump)
int i;
if (!mpi_coredump) {
- netif_err(qdev, drv, qdev->ndev, "No memory available\n");
- return -ENOMEM;
+ netif_err(qdev, drv, qdev->ndev, "No memory allocated\n");
+ return -EINVAL;
}
/* Try to get the spinlock, but dont worry if
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
index ff2bf8a..7ad1460 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
@@ -1274,7 +1274,7 @@ void ql_mpi_reset_work(struct work_struct *work)
return;
}
- if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
+ if (qdev->mpi_coredump && !ql_core_dump(qdev, qdev->mpi_coredump)) {
netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
qdev->core_is_dumped = 1;
queue_delayed_work(qdev->workqueue,
--
1.7.11.7
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] qlge: call ql_core_dump() only if dump memory was allocated.
2013-09-20 18:57 ` Malahal Naineni
@ 2013-09-20 19:00 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2013-09-20 19:00 UTC (permalink / raw)
To: malahal; +Cc: joe, netdev
From: Malahal Naineni <malahal@us.ibm.com>
Date: Fri, 20 Sep 2013 13:57:35 -0500
> Joe Perches [joe@perches.com] wrote:
>> On Fri, 2013-09-20 at 11:59 -0500, Malahal Naineni wrote:
>> > Also changed a log message to indicate that memory was not allocated
>> > instead of memory not available!
>> []
>> > diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
>> []
>> > @@ -1274,11 +1274,13 @@ void ql_mpi_reset_work(struct work_struct *work)
>> > return;
>> > }
>> >
>> > - if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
>> > - netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
>> > - qdev->core_is_dumped = 1;
>> > - queue_delayed_work(qdev->workqueue,
>> > - &qdev->mpi_core_to_log, 5 * HZ);
>> > + if (qdev->mpi_coredump) {
>> > + if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
>> > + netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
>> > + qdev->core_is_dumped = 1;
>> > + queue_delayed_work(qdev->workqueue,
>> > + &qdev->mpi_core_to_log, 5 * HZ);
>> > + }
>>
>> This can be done without adding another indentation level
>>
>> if (qdev->mpi_coredump &&
>> !ql_core_dump(qdev, qdev->mpi_coredump)) {
>>
>>
>
> Makes sense! Sending another patch as suggested:
Please don't send new versions of a patch as a reply to a thread,
instead always make a new, fresh, list posting.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-09-20 19:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-20 15:30 [PATCH] qlge: call ql_core_dump() only if dump memory was allocated Malahal Naineni
2013-09-20 16:02 ` David Miller
2013-09-20 16:59 ` Malahal Naineni
2013-09-20 18:08 ` Joe Perches
2013-09-20 18:50 ` David Miller
2013-09-20 18:57 ` Malahal Naineni
2013-09-20 19:00 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).