From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754814AbbCPNpm (ORCPT ); Mon, 16 Mar 2015 09:45:42 -0400 Received: from mx1.polytechnique.org ([129.104.30.34]:44739 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753183AbbCPNpl (ORCPT ); Mon, 16 Mar 2015 09:45:41 -0400 From: Nicolas Iooss To: jeffm@suse.com Cc: reiserfs-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Iooss Subject: [PATCH] reiserfs: fix __RASSERT format string Date: Mon, 16 Mar 2015 21:45:06 +0800 Message-Id: <1426513506-30171-1-git-send-email-nicolas.iooss_linux@m4x.org> X-Mailer: git-send-email 2.3.3 In-Reply-To: <5506D81C.50805@m4x.org> References: <5506D81C.50805@m4x.org> X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Mon Mar 16 14:45:38 2015 +0100 (CET)) X-Spam-Flag: No, tests=bogofilter, spamicity=0.000044, queueID=56411140912FE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __RASSERT format string does not use the PID argument. reiserfs_panic arguments are therefore formatted with the wrong format specifier (for example __LINE__ with %s). This bug was introduced when commit c3a9c2109f84 ("reiserfs: rework reiserfs_panic") removed a "reiserfs[%i]" prefix. This bug is only triggered when using CONFIG_REISERFS_CHECK, otherwise __RASSERT is never used. Signed-off-by: Nicolas Iooss Fixes: c3a9c2109f84 ("reiserfs: rework reiserfs_panic") --- fs/reiserfs/reiserfs.h | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h index bb79cddf0a1f..2adcde137c3f 100644 --- a/fs/reiserfs/reiserfs.h +++ b/fs/reiserfs/reiserfs.h @@ -910,7 +910,6 @@ do { \ if (!(cond)) \ reiserfs_panic(NULL, "assertion failure", "(" #cond ") at " \ __FILE__ ":%i:%s: " format "\n", \ - in_interrupt() ? -1 : task_pid_nr(current), \ __LINE__, __func__ , ##args); \ } while (0) -- 2.3.3