Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752686AbdGHCvb (ORCPT ); Fri, 7 Jul 2017 22:51:31 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34689 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751828AbdGHCv3 (ORCPT ); Fri, 7 Jul 2017 22:51:29 -0400 From: Pierre Kuo To: pmladek@suse.com Cc: sergey.senozhatsky@gmail.com, rostedt@goodmis.org, linux-kernel@vger.kernel.org, joe@perches.com, Pierre Kuo Subject: [PATCH] printk: Modify operators of printed_len Date: Sat, 8 Jul 2017 10:51:13 +0800 Message-Id: <1499482273-10638-1-git-send-email-vichy.kuo@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1126 Lines: 34 In 8b1742c9c207, we remove printk-recursion detection code in vprintk_emit(), where it is the first place that printed_len calculated. After removing above detection, it seems we can directly assign the result of log_output to printed_len. Signed-off-by: Pierre Kuo --- kernel/printk/printk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index fc47863..a2a8cac 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1701,7 +1701,7 @@ asmlinkage int vprintk_emit(int facility, int level, size_t text_len = 0; enum log_flags lflags = 0; unsigned long flags; - int printed_len = 0; + int printed_len; bool in_sched = false; if (level == LOGLEVEL_SCHED) { @@ -1754,7 +1754,7 @@ asmlinkage int vprintk_emit(int facility, int level, if (dict) lflags |= LOG_PREFIX|LOG_NEWLINE; - printed_len += log_output(facility, level, lflags, dict, dictlen, text, text_len); + printed_len = log_output(facility, level, lflags, dict, dictlen, text, text_len); logbuf_unlock_irqrestore(flags); -- 1.7.9.5