From patchwork Wed Nov 25 20:38:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11932181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48C66C56201 for ; Wed, 25 Nov 2020 20:40:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0729F207BC for ; Wed, 25 Nov 2020 20:40:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="hwQlmyy1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730181AbgKYUkG (ORCPT ); Wed, 25 Nov 2020 15:40:06 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:45192 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730012AbgKYUkG (ORCPT ); Wed, 25 Nov 2020 15:40:06 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKOfHX035997; Wed, 25 Nov 2020 20:40:04 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-2020-01-29; bh=LhOi39AblOhysnC8tMKB8RPxnquedAXf8slOxzCDvnw=; b=hwQlmyy1XPqxMGplKw/RpcJp1Tfjs5PxxIQV5H5RGUH3FTmOhSUborqh2iw/1p/aFEoV IyV90vTjzyIgAIGApsHl7dz2CjWdEJkNB0JCdX31vD3WS2GwSO7MLB5euxEN8mms5CwL L43HHl+bZRYWoPGfe9Vk/B8Ftna6aJy3kmS8ZThJZEybWL6pl3wAQQD8krWm2YxOy1g2 oyghwn7EiaZSIplmi579KGCYkNmZGB2QDqgqTtY1hYzOomxRSk0LV/0Azabcp++1FfZy JsMyTZ0cRRfP2DExtf3kO9A7IwfauTYixFEr7kpCCPmPkUaM7xX+f8K0ZO9N5ucpWdpO 6g== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 351kwhkbmq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 25 Nov 2020 20:40:04 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKPg3D117343; Wed, 25 Nov 2020 20:38:04 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3030.oracle.com with ESMTP id 351kwevga2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Nov 2020 20:38:04 +0000 Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 0APKc3x9004348; Wed, 25 Nov 2020 20:38:03 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Nov 2020 12:38:02 -0800 Subject: [PATCH 1/5] libxfs-apply: don't add duplicate headers From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Wed, 25 Nov 2020 12:38:02 -0800 Message-ID: <160633668210.634603.16132006317248436755.stgit@magnolia> In-Reply-To: <160633667604.634603.7657982642827987317.stgit@magnolia> References: <160633667604.634603.7657982642827987317.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 suspectscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 clxscore=1015 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong When we're backporting patches from libxfs, don't add a S-o-b header if there's already one at the end of the headers of the patch being ported. That way, we avoid things like: Signed-off-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Eric Sandeen Reviewed-by: Dave Chinner Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen --- tools/libxfs-apply | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/libxfs-apply b/tools/libxfs-apply index 3258272d6189..9271db380198 100755 --- a/tools/libxfs-apply +++ b/tools/libxfs-apply @@ -193,6 +193,14 @@ filter_xfsprogs_patch() rm -f $_libxfs_files } +add_header() +{ + local hdr="$1" + local hdrfile="$2" + + tail -n 1 "$hdrfile" | grep -q "^${hdr}$" || echo "$hdr" >> "$hdrfile" +} + fixup_header_format() { local _source=$1 @@ -280,13 +288,13 @@ fixup_header_format() sed -i '${/^[[:space:]]*$/d;}' $_hdr.new # Add Signed-off-by: header if specified - if [ ! -z ${SIGNED_OFF_BY+x} ]; then - echo "Signed-off-by: $SIGNED_OFF_BY" >> $_hdr.new + if [ ! -z ${SIGNED_OFF_BY+x} ]; then + add_header "Signed-off-by: $SIGNED_OFF_BY" $_hdr.new else # get it from git config if present SOB_NAME=`git config --get user.name` SOB_EMAIL=`git config --get user.email` if [ ! -z ${SOB_NAME+x} ]; then - echo "Signed-off-by: $SOB_NAME <$SOB_EMAIL>" >> $_hdr.new + add_header "Signed-off-by: $SOB_NAME <$SOB_EMAIL>" $_hdr.new fi fi From patchwork Wed Nov 25 20:38:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11932183 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A33BC56202 for ; Wed, 25 Nov 2020 20:40:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2A85207BC for ; Wed, 25 Nov 2020 20:40:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="fU/NjzLO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730256AbgKYUkM (ORCPT ); Wed, 25 Nov 2020 15:40:12 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:43474 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730012AbgKYUkM (ORCPT ); Wed, 25 Nov 2020 15:40:12 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKOt4U027985; Wed, 25 Nov 2020 20:40:10 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-2020-01-29; bh=v6cGPW2Zdptk9AjfsLkgcblhVyVAhoIFqZ9bWUkVRVw=; b=fU/NjzLO2F3rG13G6K70LH43BvFkhfwHVpDRN2Zkm3ME4DllpFpWo9pvjjb6gTg3tuJf 4carFUvOZULcYpQUqcDNGYf7uZoR0DftENhdz7llmTWycoehiI+cgXG+boh1wTGNmobD nYc/vGT1G/eyEihB4/TlEgl8yrejPsilg0RO5H06RAbS2/SEVYHbbHlgy0dZWBj1U6Wl kiObd2k0gRuxjX6P9k8eXV1QtcWx1itm/Bplx9YH+TDFSPeEaOmufyoUuGB7mkSqco7u c8KWTA6Ren4ZGzD6elgAN5VFNzPwEoNI2BQNvHki+B2Cx6xIHW9tuPYH6kJMO3FHbZN/ AQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2130.oracle.com with ESMTP id 351kwhbbdx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 25 Nov 2020 20:40:10 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKPfwW117061; Wed, 25 Nov 2020 20:38:10 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3030.oracle.com with ESMTP id 351kwevgdb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Nov 2020 20:38:10 +0000 Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 0APKc9vC015572; Wed, 25 Nov 2020 20:38:09 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Nov 2020 12:38:09 -0800 Subject: [PATCH 2/5] libxfs: fix weird comment From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Wed, 25 Nov 2020 12:38:08 -0800 Message-ID: <160633668822.634603.17791163917116618433.stgit@magnolia> In-Reply-To: <160633667604.634603.7657982642827987317.stgit@magnolia> References: <160633667604.634603.7657982642827987317.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 suspectscore=9 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 impostorscore=0 suspectscore=9 adultscore=0 bulkscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Not sure what happened with this multiline comment, but clean up all the stars. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Reviewed-by: Christoph Hellwig --- include/platform_defs.h.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in index 95e7209a3332..539bdbecf6e0 100644 --- a/include/platform_defs.h.in +++ b/include/platform_defs.h.in @@ -86,9 +86,9 @@ extern int platform_nproc(void); /* Simplified from version in include/linux/overflow.h */ /* - * * Compute a*b+c, returning SIZE_MAX on overflow. Internal helper for - * * struct_size() below. - * */ + * Compute a*b+c, returning SIZE_MAX on overflow. Internal helper for + * struct_size() below. + */ static inline size_t __ab_c_size(size_t a, size_t b, size_t c) { return (a * b) + c; From patchwork Wed Nov 25 20:38:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11932169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D099C56202 for ; Wed, 25 Nov 2020 20:39:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C4C2207BB for ; Wed, 25 Nov 2020 20:39:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="J6s/EqcX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730237AbgKYUiT (ORCPT ); Wed, 25 Nov 2020 15:38:19 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:42290 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730181AbgKYUiS (ORCPT ); Wed, 25 Nov 2020 15:38:18 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKPOaD028107; Wed, 25 Nov 2020 20:38:16 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-2020-01-29; bh=7cfiKS4S6hSwO9bMuus723bLiZe3tYnM0iGxQ0ukg1k=; b=J6s/EqcX44WzrRrkJdCFW8yjdIdlZ5DSnZHGdDoc7NwSqCWQr1A0Wjpu7yWdHgWYQsqj 6zemfHCtNhwxsresKlUAWWrgmUrqucuJye8gyi3EjiJoPLhZ3Yhd+gceUKJWuUkrHMeH HE6iLZbdhiqjWboYhJeXL/cbSAxbx0es+74IqhVOXY36+I7urKLKPbzdX/oz3VMucVQm FOidG7rKcJkYOp2aMP4xn64Y2IrUJ7XZQKiegL6sRiZcG4tTObnx1FvlCr1p3rXN+EIW eYby2HOfzRmj782BnMPrrQ96cRg57ca5NjiE3z12WupagqVaqHb9iB2OU5XoJqpIQ7Kq EA== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2130.oracle.com with ESMTP id 351kwhbb8u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 25 Nov 2020 20:38:16 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKQ4es066285; Wed, 25 Nov 2020 20:38:15 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3030.oracle.com with ESMTP id 351n2jdym9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Nov 2020 20:38:15 +0000 Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 0APKcFbT029073; Wed, 25 Nov 2020 20:38:15 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Nov 2020 12:38:15 -0800 Subject: [PATCH 3/5] libxfs: add realtime extent reservation and usage tracking to transactions From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Wed, 25 Nov 2020 12:38:14 -0800 Message-ID: <160633669427.634603.6917592828334064504.stgit@magnolia> In-Reply-To: <160633667604.634603.7657982642827987317.stgit@magnolia> References: <160633667604.634603.7657982642827987317.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 bulkscore=0 mlxlogscore=999 spamscore=0 phishscore=0 malwarescore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 impostorscore=0 suspectscore=0 adultscore=0 bulkscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong The libxfs resync added to the deferred ops code the ability to capture the unfinished deferred ops and transaction reservation for later replay during log recovery. This nominally requires transactions to have the ability to track rt extent reservations and usage, so port that missing piece from the kernel now to avoid leaving logic bombs in case anyone ever /does/ start messing with realtime. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- libxfs/trans.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libxfs/trans.c b/libxfs/trans.c index 83247582d61e..bc4af26c09f6 100644 --- a/libxfs/trans.c +++ b/libxfs/trans.c @@ -230,6 +230,7 @@ xfs_trans_reserve( error = -ENOSPC; goto undo_blocks; } + tp->t_rtx_res += rtextents; } return 0; @@ -765,6 +766,19 @@ _("Transaction block reservation exceeded! %u > %u\n"), tp->t_ifree_delta += delta; break; case XFS_TRANS_SB_FREXTENTS: + /* + * Track the number of rt extents allocated in the transaction. + * Make sure it does not exceed the number reserved. + */ + if (delta < 0) { + tp->t_rtx_res_used += (uint)-delta; + if (tp->t_rtx_res_used > tp->t_rtx_res) { + fprintf(stderr, +_("Transaction rt block reservation exceeded! %u > %u\n"), + tp->t_rtx_res_used, tp->t_rtx_res); + ASSERT(0); + } + } tp->t_frextents_delta += delta; break; default: From patchwork Wed Nov 25 20:38:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11932171 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0A7AC56201 for ; Wed, 25 Nov 2020 20:39:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5EEA1207BC for ; Wed, 25 Nov 2020 20:39:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="nJIYTmPS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730240AbgKYUi1 (ORCPT ); Wed, 25 Nov 2020 15:38:27 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:43156 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730181AbgKYUi0 (ORCPT ); Wed, 25 Nov 2020 15:38:26 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKOdL3035945; Wed, 25 Nov 2020 20:38:23 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-2020-01-29; bh=WmerEUUk95AtJMnNOXCmuz8wO7Svydw4JGkxc1qW8To=; b=nJIYTmPShtBZ46oLiXDadP8OzT8z9UOfnL0d/WFaA33Og7elb1nUVNTDSbj3HO0cZL/4 sm1tfFf2OqYWxVoN3Xd4C+8WN1/8NJ6IVsV7oLY8wofAgeIYKrQ/F+Vkp6MIPMXbvpO/ bOCGxk7g4mYqSHTyS5dvr4byI5Kl1ssRlNpb2whir7EaANb7WwDC8FNvcLsBnLfMaB0K NNwtyG+2U1zJ/Nsmu4QEBakfdAzVTYzEao/4uOvZBWYLI0qFhcH9khbs0x5xtc2MK0ET DdqWNf4AO8Ll300mSi73cPSXFGePp/+4vvwvcBVqNcKsxBjeSuEvvql05MxNrCLnAdme qQ== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 351kwhkbev-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 25 Nov 2020 20:38:23 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKQ4iG066302; Wed, 25 Nov 2020 20:38:23 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3030.oracle.com with ESMTP id 351n2jdypd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Nov 2020 20:38:22 +0000 Received: from abhmp0014.oracle.com (abhmp0014.oracle.com [141.146.116.20]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 0APKcL3n015643; Wed, 25 Nov 2020 20:38:21 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Nov 2020 12:38:21 -0800 Subject: [PATCH 4/5] debian: fix version in changelog From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Wed, 25 Nov 2020 12:38:20 -0800 Message-ID: <160633670037.634603.12898768383906866110.stgit@magnolia> In-Reply-To: <160633667604.634603.7657982642827987317.stgit@magnolia> References: <160633667604.634603.7657982642827987317.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 bulkscore=0 mlxlogscore=999 spamscore=0 phishscore=0 malwarescore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 clxscore=1015 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong We're still at 5.10-rc0, at least according to the tags. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c41e3913efa4..ba6861985365 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xfsprogs (5.10.0-1) unstable; urgency=low +xfsprogs (5.10.0-rc0-1) unstable; urgency=low * New upstream prerelease From patchwork Wed Nov 25 20:38:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11932175 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 027ABC63777 for ; Wed, 25 Nov 2020 20:39:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FB46207BB for ; Wed, 25 Nov 2020 20:39:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="lwsy51Ix" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730242AbgKYUid (ORCPT ); Wed, 25 Nov 2020 15:38:33 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:42494 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730181AbgKYUid (ORCPT ); Wed, 25 Nov 2020 15:38:33 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKOimb027870; Wed, 25 Nov 2020 20:38:31 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-2020-01-29; bh=Cq5DJjZJuraFDZU36UnInSbmKNaroz8wPnJ4hJ4kLUI=; b=lwsy51IxzPvhZ5zoHthB4Y63MbKnpXWI6pm8c/lZPd298iNTn2FGVkhlEjISTgd42xzV bzix14oAGLWlfRw2XVJnxM3xUR7XDpBJ+qvmRAX5DRrJHJAc8kP3Cwtrh0CKmJgHAFq2 vjoQSVDX8uinAfwssfww7dUzDHDa11kJppe2PtlGJ+9XlItAMZsK/ceUWphZuNtdFZtm 93Q7vQAJ0biYoo00puBxhIZA5x5GDaHxn/c1oMvQkHs8dWAUSuXM0yiDotCsPZFQtqnX gG0vRIbC36qrKQTcmghz64q5JDJNpX7YvTaPiR3MjGJcI2vqlbqKzS+qGGTzfWI6gTFP VQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2130.oracle.com with ESMTP id 351kwhbb9t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 25 Nov 2020 20:38:31 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0APKPe6r116935; Wed, 25 Nov 2020 20:38:30 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3030.oracle.com with ESMTP id 351kwevgjc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Nov 2020 20:38:30 +0000 Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 0APKcTs7004546; Wed, 25 Nov 2020 20:38:29 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Nov 2020 12:38:29 -0800 Subject: [PATCH 5/5] debian: add build dependency on libinih-dev From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Wed, 25 Nov 2020 12:38:26 -0800 Message-ID: <160633670660.634603.13629119948503534425.stgit@magnolia> In-Reply-To: <160633667604.634603.7657982642827987317.stgit@magnolia> References: <160633667604.634603.7657982642827987317.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 suspectscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9816 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 impostorscore=0 suspectscore=0 adultscore=0 bulkscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011250127 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong mkfs now supports configuration files, which are parsed using libinih. Add this dependency to the debian build. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Reviewed-by: Dave Chinner --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ddd17850e378..49ffd3409dc0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: XFS Development Team Uploaders: Nathan Scott , Anibal Monsalve Salazar -Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python, pkg-config +Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python, pkg-config Standards-Version: 4.0.0 Homepage: https://xfs.wiki.kernel.org/