From patchwork Wed Jun 26 02:37:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11016915 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 1879813B4 for ; Wed, 26 Jun 2019 02:37:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06DD2285E0 for ; Wed, 26 Jun 2019 02:37:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EED96285E3; Wed, 26 Jun 2019 02:37:39 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6C02285E0 for ; Wed, 26 Jun 2019 02:37:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726754AbfFZChi (ORCPT ); Tue, 25 Jun 2019 22:37:38 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:59848 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726735AbfFZChi (ORCPT ); Tue, 25 Jun 2019 22:37:38 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5Q2YGSE120307; Wed, 26 Jun 2019 02:37:36 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=a4Ae/ui4mUzj5LTuy5Kzv3nR5vwNUiZsRpdH/6w0om4=; b=AzOEv6vufH8slsIcLQOECRP+l+rrDrsyXL53nWLOMMYDekzVxb/Zm9x7PueoPs+yzKYS gHUvevE8dujyr0XaC81GJbhouSJeVVr30E3ISxghq9c0O5EkK3REHHnKdt5w9hmLlCj/ +fnZpRn/nBdc92NC9DPg+Br3ITlP0pPkEpqvUMt71+AoAurdH+4Y+Fng+siIHqwNYvfy bLPAQiE+7V9s0fHcvFJIl5No0dgdHXZcg8tR+VHpSY08lbQtkcjSrJ1IAHjlqUUOY0rA +zt16QG5VTW9Y1beQtoMKT8pdJ45JUywUq2PsW2dnnK1SDMpDr2FqrFO8nsndExtxsKW SA== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 2t9brt7mwv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 26 Jun 2019 02:37:36 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5Q2bYBL159556; Wed, 26 Jun 2019 02:37:35 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3030.oracle.com with ESMTP id 2t9accejrb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 26 Jun 2019 02:37:35 +0000 Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x5Q2bZKA024030; Wed, 26 Jun 2019 02:37:35 GMT Received: from localhost (/10.159.230.235) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 25 Jun 2019 19:37:34 -0700 Subject: [PATCH 07/10] libxfs-diff: try harder to find the kernel equivalent libxfs files From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Tue, 25 Jun 2019 19:37:33 -0700 Message-ID: <156151665396.2286979.8848777429156280703.stgit@magnolia> In-Reply-To: <156151660523.2286979.13694849827562044045.stgit@magnolia> References: <156151660523.2286979.13694849827562044045.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9299 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906260029 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9299 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906260028 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Now that we're syncing userspace libxfs/ files with kernel fs/xfs/ files, teach the diff tool to try fs/xfs/xfs_foo.c if fs/xfs/libxfs/xfs_foo.c doesn't exist. Signed-off-by: Darrick J. Wong --- tools/libxfs-diff | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/libxfs-diff b/tools/libxfs-diff index fa57c004..c18ad487 100755 --- a/tools/libxfs-diff +++ b/tools/libxfs-diff @@ -22,5 +22,6 @@ dir="$(readlink -m "${dir}/..")" for i in libxfs/xfs*.[ch]; do kfile="${dir}/$i" + test -f "${kfile}" || kfile="$(echo "${kfile}" | sed -e 's|libxfs/||g')" diff -Naurpw --label "$i" <(sed -e '/#include/d' "$i") --label "${kfile}" <(sed -e '/#include/d' "${kfile}") done