Hi，
On 2022/6/23 16:16, Miaohe Lin wrote:
From: Yejune Deng yejune.deng@gmail.com
mainline inclusion from v5.11-rc1 commit a01a89b1db1066a6af23ae08b9a0c345b7966f0b category: bugfix bugzilla: NA
Please file a issue at https://gitee.com/openeuler/kernel/, describe which problem your want to fix, and put the url behind "bugzilla".
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
atomic_inc() and atomic_dec() looks better
Signed-off-by: Yejune Deng yejune.deng@gmail.com Message-Id: 1605511807-7135-1-git-send-email-yejune.deng@gmail.com Signed-off-by: Corey Minyard cminyard@mvista.com
drivers/char/ipmi/ipmi_watchdog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index f78156d93c3f..32c334e34d55 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -495,7 +495,7 @@ static void panic_halt_ipmi_heartbeat(void) msg.cmd = IPMI_WDOG_RESET_TIMER; msg.data = NULL; msg.data_len = 0;
- atomic_add(1, &panic_done_count);
- atomic_inc(&panic_done_count); rv = ipmi_request_supply_msgs(watchdog_user, (struct ipmi_addr *) &addr, 0,
@@ -505,7 +505,7 @@ static void panic_halt_ipmi_heartbeat(void) &panic_halt_heartbeat_recv_msg, 1); if (rv)
atomic_sub(1, &panic_done_count);
atomic_dec(&panic_done_count);}
static struct ipmi_smi_msg panic_halt_smi_msg = { @@ -529,12 +529,12 @@ static void panic_halt_ipmi_set_timeout(void) /* Wait for the messages to be free. */ while (atomic_read(&panic_done_count) != 0) ipmi_poll_interface(watchdog_user);
- atomic_add(1, &panic_done_count);
- atomic_inc(&panic_done_count); rv = __ipmi_set_timeout(&panic_halt_smi_msg, &panic_halt_recv_msg, &send_heartbeat_now); if (rv) {
atomic_sub(1, &panic_done_count);
atomic_dec(&panic_done_count);