From patchwork Wed Oct 17 22:46:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10646453 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B82AD15E2 for ; Wed, 17 Oct 2018 22:47:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8B04288CA for ; Wed, 17 Oct 2018 22:47:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D201288E4; Wed, 17 Oct 2018 22:47:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EC3A288C7 for ; Wed, 17 Oct 2018 22:47:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F23E6B028F; Wed, 17 Oct 2018 18:47:05 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1A34D6B0291; Wed, 17 Oct 2018 18:47:05 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 046B16B0292; Wed, 17 Oct 2018 18:47:04 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id B3AFF6B028F for ; Wed, 17 Oct 2018 18:47:04 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id x2-v6so21048435pgr.8 for ; Wed, 17 Oct 2018 15:47:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:subject:from:to:cc:date :message-id:in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=SGDSArbiullpYs/XPOG6T2xvgHyk5haCgm1b67adURI=; b=LBzbBACplDCV3hiKRQ184O63CYOQyclzcELEH0jumZ/t6AKQ+ZFYdZLnG2Nsa7SSIk taU3/BIkuq8CfMZhF7zNUMVjN26y4F8CifT6nt8WBCX/a8adPb82QzVj2ytNQITBeP+J rJbmdsUm4Ili40LUgHl2V7fYoiM0B6lmntfHyH9sXpPRBzk7VZaeOgh9Gz2NCwPrVxHY AqFivNBJy+LpuFsMg5UJoxgViMyndywG1QERGAdFlWF77ZI51smaTbP70xypPp4Q0pyq D1e1L8VGP/22KcqOo0MjTLErdsHzwl6bDEHDcYMGFXFDm8dR85YGfmr74xTHXAGAYobK VPlQ== X-Gm-Message-State: ABuFfoiQeep+kw+UR5+HJW1/UMOvmf5FHMNrzzuWmUf3Il40xW9Valrc 8npswdySEmIDgFUIw8lKgX5a2oG530ki/Vqexw5cxLYHR2avROWVAWKxUl/6fl8pDkXw4CyQ8qF 1Jb64P3rqDcVLumlhpYtHE7ZBUgjh6JkBAh+/KvJN5ULXTPj7BDudBVY+sVDoSi2liQ== X-Received: by 2002:aa7:80cd:: with SMTP id a13-v6mr27878990pfn.86.1539816424400; Wed, 17 Oct 2018 15:47:04 -0700 (PDT) X-Google-Smtp-Source: ACcGV62ZdF99hMEtkt005cgRd6diyWqxavUhI9o94ACi2zR6EyEr85+Ho1jZ8us7/MI09xyD/aq4 X-Received: by 2002:aa7:80cd:: with SMTP id a13-v6mr27878964pfn.86.1539816423736; Wed, 17 Oct 2018 15:47:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539816423; cv=none; d=google.com; s=arc-20160816; b=MX1JKToxTkGDmfhJOZnzdtdBudvXMVjX0sfxlI530DEKeGTyWAG90YQQnMd2CXExHO 4CGRNNeOiXO6JFa3OhIxi/uBGFT3gI0+c0t0fSvorh2+oST/737UWSTA8I2YVyeODwIG DVd7wvT/SjQRV/BSBQCADZCc0A8ltzye6LupwBruhxgs+3PKyaAYutqiALwvKHVdXlAt enNu4MM9E2qQqmtYEgeJH8z+II/thPuZKkft38d5SX+B+j/JqbCymR4F1wtM/Ps2Kh5P 1DI0w+5QRAa4fgco0GidOkOrmL6lAeMsoSb2L6+UkaWPYQZU+OThI2E8DljR9HbYbDGx R7Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject:dkim-signature; bh=SGDSArbiullpYs/XPOG6T2xvgHyk5haCgm1b67adURI=; b=fT7iHO4uy+hm6XSd9IWfet70HBFXuq/V0GeQApSmTushcTTxIOXPejv+ayQf+hTzvh yUPbTIbOUSBUzKJcMgYpqGkSJKVyt/uOdyizZz+45Eok4brlg7NpnAGJdmX1a+KWfRg4 q0GkrKKmoISazUxg/LDhTT+gCEAz5cIiurF4mdd/0tMqrH/LQ5ZfKndkiLfpeQryX6co EHkuxRoFZXzc/hly+juKwR3ZdhA6tzztAYfHQf/hY1QMVf+n4DY8OLsW3JCYN80J/aN2 XeYwj70DiykcxO3556aIT4VhXAIMVzz0pGvOqYWnPcTl5rUkHmhWautlnEmnkPPzVEYT oh2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=GpfsTTzn; spf=pass (google.com: domain of darrick.wong@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from userp2120.oracle.com (userp2120.oracle.com. [156.151.31.85]) by mx.google.com with ESMTPS id bb10-v6si18506072plb.359.2018.10.17.15.47.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Oct 2018 15:47:03 -0700 (PDT) Received-SPF: pass (google.com: domain of darrick.wong@oracle.com designates 156.151.31.85 as permitted sender) client-ip=156.151.31.85; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=GpfsTTzn; spf=pass (google.com: domain of darrick.wong@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9HMjJCk190217; Wed, 17 Oct 2018 22:47:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=SGDSArbiullpYs/XPOG6T2xvgHyk5haCgm1b67adURI=; b=GpfsTTzn2FDJOHVvdOCtMqCeAseCxfMgHNLE+mQwEdG77npdgHddYIEYM2/zi1ISAPsz R1VueayZv2tBM8+cEkl4KaeT6O+U0lPnv+Diw7fgZSrYBNQi2h3AVRgf2fKjOcCcPOln x7LBzYy72Lzr01waDkzXsU6XUS5fhmNhe9nJKTH6Cne3lb+e/iNbcI/fZOQwe3horA/e LVYfol8SX9g2G7c2dkZsQ8+z6G7oIt+lP09n8ih1aj9HxyqCjQD4CAZAlwC+oK5pc5iQ KlDXEvLyj0M+NlTzelagWWcojei/EswJTYptda+tlV835Uuo7rIkh9xzkDZrVifjCe6+ XA== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2n39brhp9b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Oct 2018 22:47:02 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9HMl2s7013248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Oct 2018 22:47:02 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w9HMl1rL031780; Wed, 17 Oct 2018 22:47:01 GMT Received: from localhost (/10.159.132.177) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 17 Oct 2018 15:47:01 -0700 Subject: [PATCH 23/29] xfs: add a per-xfs trace_printk macro From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Date: Wed, 17 Oct 2018 15:46:59 -0700 Message-ID: <153981641972.5568.6155004838582569988.stgit@magnolia> In-Reply-To: <153981625504.5568.2708520119290577378.stgit@magnolia> References: <153981625504.5568.2708520119290577378.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9049 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=966 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810170188 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Add a "xfs_tprintk" macro so that developers can use trace_printk to print out arbitrary debugging information with the XFS device name attached to the trace output. Signed-off-by: Darrick J. Wong --- fs/xfs/xfs_error.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h index 246d3e989c6c..5caa8bdf6c38 100644 --- a/fs/xfs/xfs_error.h +++ b/fs/xfs/xfs_error.h @@ -76,6 +76,11 @@ extern int xfs_errortag_set(struct xfs_mount *mp, unsigned int error_tag, unsigned int tag_value); extern int xfs_errortag_add(struct xfs_mount *mp, unsigned int error_tag); extern int xfs_errortag_clearall(struct xfs_mount *mp); + +/* trace printk version of xfs_err and friends */ +#define xfs_tprintk(mp, fmt, args...) \ + trace_printk("dev %d:%d " fmt, MAJOR((mp)->m_super->s_dev), \ + MINOR((mp)->m_super->s_dev), ##args) #else #define xfs_errortag_init(mp) (0) #define xfs_errortag_del(mp) @@ -83,6 +88,7 @@ extern int xfs_errortag_clearall(struct xfs_mount *mp); #define xfs_errortag_set(mp, tag, val) (ENOSYS) #define xfs_errortag_add(mp, tag) (ENOSYS) #define xfs_errortag_clearall(mp) (ENOSYS) +#define xfs_tprintk(mp, fmt, args...) do { } while (0) #endif /* DEBUG */ /*