From patchwork Tue Jun 4 21:16:49 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: 10976129 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 A9D123A3F for ; Tue, 4 Jun 2019 21:16:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C77E22A2A for ; Tue, 4 Jun 2019 21:16:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90E6328420; Tue, 4 Jun 2019 21:16:58 +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=unavailable 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 24A5B2877B for ; Tue, 4 Jun 2019 21:16:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726341AbfFDVQ5 (ORCPT ); Tue, 4 Jun 2019 17:16:57 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:38050 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726269AbfFDVQ5 (ORCPT ); Tue, 4 Jun 2019 17:16:57 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x54KwQKW035349; Tue, 4 Jun 2019 21:16:52 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=uScVj9tK3zvBhfr4n+mPGFgt/jRHdA/h7Z0UN804Quk=; b=FeBF461l0HRmB9EkjQbHMRrsFfCWBB5Uj00RTY1qgeW9Dz9t4Man8b8rpnNgS+pRxxGm aD8J0Abe/CHocP21nSZX3HbhP6s4rVYcPVAhM9qf85A7iilz1+Kpiex98Fi7KiGAinXB P2xfWvTtjGiyXwT+CjJ2LPWdMc+D2UIWgOzx4jyu4nbJ39N7NWORrfRH5p0n2C2aV1C0 6ZStBmALlyPuu1Rz2Wk+eunOYT2nUlCv7fFReV51xm4O94jIygV7h6JMo7uC/gOHcvu/ UY6MwI4EFyEDzT5fVRu40WVyyWBMFvMWble2tvW5OJvafn2Wcgd8Vlz9tK0AN1cRssDT 6w== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2130.oracle.com with ESMTP id 2suevdfsfw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2019 21:16:52 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x54LGU5v147654; Tue, 4 Jun 2019 21:16:51 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3020.oracle.com with ESMTP id 2swnh9twft-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2019 21:16:51 +0000 Received: from abhmp0020.oracle.com (abhmp0020.oracle.com [141.146.116.26]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x54LGo2x009120; Tue, 4 Jun 2019 21:16:50 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 04 Jun 2019 14:16:50 -0700 Subject: [PATCH 1/3] check: try to insulate the test framework from oom killer From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 04 Jun 2019 14:16:49 -0700 Message-ID: <155968300919.1646947.15217696927864278918.stgit@magnolia> In-Reply-To: <155968300283.1646947.2586545304045786757.stgit@magnolia> References: <155968300283.1646947.2586545304045786757.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9278 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-1906040133 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9278 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-1906040133 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 Some of the tests in xfstests (e.g. generic/224 with 512M of memory) consume a lot of memory, and when this happens the OOM killer will run around stomping on processes. Sometimes it kills the ./check process before it kills the actual test, which means that the test run doesn't complete. Therefore, make the ./check process OOM-proof while bumping up the attractiveness of the test itself, in the hopes that even if the test OOMs we'll still be able to continue on our way. Signed-off-by: Darrick J. Wong --- check | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/check b/check index 8677141b..08419811 100755 --- a/check +++ b/check @@ -499,6 +499,17 @@ _expunge_test() return 0 } +# Make the check script unattractive to the OOM killer... +OOM_SCORE_ADJ="/proc/self/oom_score_adj" +test -w ${OOM_SCORE_ADJ} && echo -1000 > ${OOM_SCORE_ADJ} + +# ...and make the tests themselves somewhat more attractive to it, so that if +# the system runs out of memory it'll be the test that gets killed and not the +# test framework. +_run_seq() { + bash -c "test -w ${OOM_SCORE_ADJ} && echo 250 > ${OOM_SCORE_ADJ}; exec ./$seq" +} + _detect_kmemleak _prepare_test_list @@ -740,11 +751,11 @@ for section in $HOST_OPTIONS_SECTIONS; do fi _try_wipe_scratch_devs > /dev/null 2>&1 if [ "$DUMP_OUTPUT" = true ]; then - ./$seq 2>&1 | tee $tmp.out + _run_seq 2>&1 | tee $tmp.out # Because $? would get tee's return code sts=${PIPESTATUS[0]} else - ./$seq >$tmp.out 2>&1 + _run_seq >$tmp.out 2>&1 sts=$? fi From patchwork Tue Jun 4 21:16:55 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: 10976133 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 98A7F3A3F for ; Tue, 4 Jun 2019 21:17:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B77B28420 for ; Tue, 4 Jun 2019 21:17:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D65E28448; Tue, 4 Jun 2019 21:17:05 +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=unavailable 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 6640828726 for ; Tue, 4 Jun 2019 21:17:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726373AbfFDVRE (ORCPT ); Tue, 4 Jun 2019 17:17:04 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:58576 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726269AbfFDVRD (ORCPT ); Tue, 4 Jun 2019 17:17:03 -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 x54KwWKo014968; Tue, 4 Jun 2019 21:16:59 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=3Hgyl8NttdgXyFlFIsE84/I1i+5edQaw/F/1MLNDLgs=; b=e3eg+THKrwQaaPpQm+wfdVqHvIm9kwqK+l/SMqaFHOMXfOC+pY8NFU2qttawdrvQJ5+J qao2zxHogoOQj1abGb1ICF/SDzI3HNAovwHXZm+CkihrqTq9GZEu82urimsWIhKZ2N+Q CQ4UIpyxkyIh1U7qKJFoalXh1xMFIBq7Bky5dRva97Adw0erj0dh/49EfUlnvJgOJN6S LoFCLXvFBw5bmpm9ZP3nBNkh+bG6CeTC5naUs8Lt7fvfHEuz+niwbR97Kz7nCHzfKpQg j09LFprdBG/otUHikCcAI5c2DowuIOw5GF7alN5urP2y+m7XG7Z1jqqh94RzKFMCtcKj 6g== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2130.oracle.com with ESMTP id 2sugstfjja-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2019 21:16:58 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x54LFqct143307; Tue, 4 Jun 2019 21:16:58 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserp3020.oracle.com with ESMTP id 2swnghjyus-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2019 21:16:58 +0000 Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x54LGvL7026299; Tue, 4 Jun 2019 21:16:57 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 04 Jun 2019 14:16:56 -0700 Subject: [PATCH 2/3] xfs/122: add new ioctl structures From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 04 Jun 2019 14:16:55 -0700 Message-ID: <155968301540.1646947.7830716613133171656.stgit@magnolia> In-Reply-To: <155968300283.1646947.2586545304045786757.stgit@magnolia> References: <155968300283.1646947.2586545304045786757.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9278 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=969 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906040133 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9278 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-1906040133 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 Add some new ioctls that are being introduced in 5.2. Signed-off-by: Darrick J. Wong --- tests/xfs/122.out | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/xfs/122.out b/tests/xfs/122.out index 92fb46ae..cf9ac9e2 100644 --- a/tests/xfs/122.out +++ b/tests/xfs/122.out @@ -57,6 +57,7 @@ offsetof(xfs_sb_t, sb_versionnum) = 100 offsetof(xfs_sb_t, sb_width) = 188 sizeof(struct xfs_acl) = 4 sizeof(struct xfs_acl_entry) = 12 +sizeof(struct xfs_ag_geometry) = 128 sizeof(struct xfs_attr3_leaf_hdr) = 80 sizeof(struct xfs_attr3_leafblock) = 88 sizeof(struct xfs_attr3_rmt_hdr) = 56 @@ -82,6 +83,9 @@ sizeof(struct xfs_extent_data) = 24 sizeof(struct xfs_extent_data_info) = 32 sizeof(struct xfs_fs_eofblocks) = 128 sizeof(struct xfs_fsop_ag_resblks) = 64 +sizeof(struct xfs_fsop_geom) = 256 +sizeof(struct xfs_fsop_geom_v1) = 112 +sizeof(struct xfs_fsop_geom_v4) = 112 sizeof(struct xfs_icreate_log) = 28 sizeof(struct xfs_inode_log_format) = 56 sizeof(struct xfs_inode_log_format_32) = 52 From patchwork Tue Jun 4 21:17:01 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: 10976141 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 D22853A3F for ; Tue, 4 Jun 2019 21:17:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C472828448 for ; Tue, 4 Jun 2019 21:17:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8F3E28682; Tue, 4 Jun 2019 21:17:10 +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=unavailable 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 F3CA228849 for ; Tue, 4 Jun 2019 21:17:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726465AbfFDVRJ (ORCPT ); Tue, 4 Jun 2019 17:17:09 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:58660 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726399AbfFDVRJ (ORCPT ); Tue, 4 Jun 2019 17:17:09 -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 x54KwaVg015256; Tue, 4 Jun 2019 21:17: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-2018-07-02; bh=vkrJgng1Ih1Tko8QHI245wIvqCUzgBDLxRgio60uX2M=; b=QmbOz6YkUJdiFNedX6y1+nTs8FMhpnP7PBBEqKs0V7kDCwYBFVOwlWg6o25u9jq/1Qch fZdDH+7ICmXuJSTJluc/KdX4tkmDl2PF45DNHUGxtOrKEA/RmjyqG/XfMOIfCWhQZc1X 4bRmNb8Ai75kQ8mi25HZHE9N03IPq3/WiaAkJMZqYjvN4d6tLvoMOzc+2AdA6H6AWwMq l2jgplTUG2zbNtERp5lpY2OWZN9OnKSMkRy2Yd3E1tNep/k1ZuEGGqJ9dWhpZGi9dpA9 46/npz4q3PSdeU2DkjRH0X8sdY+hywCSRlKB6FNDWya+QWskAQCzU8eHHshMSNAV7mqX GA== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 2sugstfjju-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2019 21:17:04 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x54LGUMh147736; Tue, 4 Jun 2019 21:17:04 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3020.oracle.com with ESMTP id 2swnh9twk8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2019 21:17:04 +0000 Received: from abhmp0020.oracle.com (abhmp0020.oracle.com [141.146.116.26]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x54LH3BO023578; Tue, 4 Jun 2019 21:17:03 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 04 Jun 2019 14:17:02 -0700 Subject: [PATCH 3/3] common: remove obsolete xfs ioctl typedef usage From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 04 Jun 2019 14:17:01 -0700 Message-ID: <155968302188.1646947.321648284422396629.stgit@magnolia> In-Reply-To: <155968300283.1646947.2586545304045786757.stgit@magnolia> References: <155968300283.1646947.2586545304045786757.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9278 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=924 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906040133 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9278 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=963 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906040133 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 Convert 'xfs_foo_t' typedef usage to 'struct xfs_foo' in preparation for changes to some of the xfs ioctls. Signed-off-by: Darrick J. Wong --- ltp/fsstress.c | 8 ++++---- src/bstat.c | 6 +++--- src/bulkstat_unlink_test.c | 8 ++++---- src/bulkstat_unlink_test_modified.c | 10 +++++----- src/t_immutable.c | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 279da9f1..d41e776c 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -2152,9 +2152,9 @@ bulkstat_f(int opno, long r) int fd; __u64 last; int nent; - xfs_bstat_t *t; + struct xfs_bstat *t; int64_t total; - xfs_fsop_bulkreq_t bsr; + struct xfs_fsop_bulkreq bsr; last = 0; nent = (r % 999) + 2; @@ -2185,9 +2185,9 @@ bulkstat1_f(int opno, long r) int good; __u64 ino; struct stat64 s; - xfs_bstat_t t; + struct xfs_bstat t; int v; - xfs_fsop_bulkreq_t bsr; + struct xfs_fsop_bulkreq bsr; good = random() & 1; diff --git a/src/bstat.c b/src/bstat.c index e4367cee..3f3dc2c6 100644 --- a/src/bstat.c +++ b/src/bstat.c @@ -20,7 +20,7 @@ dotime(void *ti, char *s) } void -printbstat(xfs_bstat_t *sp) +printbstat(struct xfs_bstat *sp) { printf("ino %lld mode %#o nlink %d uid %d gid %d rdev %#x\n", (long long)sp->bs_ino, sp->bs_mode, sp->bs_nlink, @@ -64,7 +64,7 @@ main(int argc, char **argv) int quiet = 0; int statit = 0; int verbose = 0; - xfs_bstat_t *t; + struct xfs_bstat *t; int ret; jdm_fshandle_t *fshandlep = NULL; int fd; @@ -73,7 +73,7 @@ main(int argc, char **argv) char *cc_readlinkbufp; int cc_readlinkbufsz; int c; - xfs_fsop_bulkreq_t bulkreq; + struct xfs_fsop_bulkreq bulkreq; while ((c = getopt(argc, argv, "cdl:qv")) != -1) { switch (c) { diff --git a/src/bulkstat_unlink_test.c b/src/bulkstat_unlink_test.c index cdf720ef..d78cc2ac 100644 --- a/src/bulkstat_unlink_test.c +++ b/src/bulkstat_unlink_test.c @@ -26,8 +26,8 @@ main(int argc, char *argv[]) struct stat sbuf; ino_t *inodelist; - xfs_fsop_bulkreq_t a; - xfs_bstat_t *ret; + struct xfs_fsop_bulkreq a; + struct xfs_bstat *ret; int iterations; char fname[MAXPATHLEN]; char *dirname; @@ -60,7 +60,7 @@ main(int argc, char *argv[]) printf("Runing extended checks.\n"); inodelist = (ino_t *)malloc(nfiles * sizeof(ino_t)); - ret = (xfs_bstat_t *)malloc(nfiles * sizeof(xfs_bstat_t)); + ret = (struct xfs_bstat *)malloc(nfiles * sizeof(struct xfs_bstat)); for (k=0; k < iterations; k++) { int fd[nfiles + 1]; @@ -69,7 +69,7 @@ main(int argc, char *argv[]) printf("Iteration %d ... (%d files)", k, nfiles); - memset(&a, 0, sizeof(xfs_fsop_bulkreq_t)); + memset(&a, 0, sizeof(struct xfs_fsop_bulkreq)); a.lastip = (__u64 *)&last_inode; a.icount = nfiles; a.ubuffer = ret; diff --git a/src/bulkstat_unlink_test_modified.c b/src/bulkstat_unlink_test_modified.c index 981d80cc..a106749d 100644 --- a/src/bulkstat_unlink_test_modified.c +++ b/src/bulkstat_unlink_test_modified.c @@ -27,8 +27,8 @@ main(int argc, char *argv[]) struct stat sbuf; ino_t *inodelist; __u32 *genlist; - xfs_fsop_bulkreq_t a; - xfs_bstat_t *ret; + struct xfs_fsop_bulkreq a; + struct xfs_bstat *ret; int iterations; char fname[MAXPATHLEN]; char *dirname; @@ -50,7 +50,7 @@ main(int argc, char *argv[]) inodelist = (ino_t *)malloc(nfiles * sizeof(ino_t)); genlist = (__u32 *)malloc(nfiles * sizeof(__u32)); - ret = (xfs_bstat_t *)malloc(nfiles * sizeof(xfs_bstat_t)); + ret = (struct xfs_bstat *)malloc(nfiles * sizeof(struct xfs_bstat)); for (k=0; k < iterations; k++) { xfs_ino_t last_inode = 0; @@ -61,8 +61,8 @@ main(int argc, char *argv[]) memset(inodelist, 0, nfiles * sizeof(ino_t)); memset(genlist, 0, nfiles * sizeof(__u32)); - memset(ret, 0, nfiles * sizeof(xfs_bstat_t)); - memset(&a, 0, sizeof(xfs_fsop_bulkreq_t)); + memset(ret, 0, nfiles * sizeof(struct xfs_bstat)); + memset(&a, 0, sizeof(struct xfs_fsop_bulkreq)); a.lastip = (__u64 *)&last_inode; a.icount = nfiles; a.ubuffer = ret; diff --git a/src/t_immutable.c b/src/t_immutable.c index eadef78f..86c567ed 100644 --- a/src/t_immutable.c +++ b/src/t_immutable.c @@ -228,8 +228,8 @@ static int test_immutable(const char *dir) if (stfs.f_type == XFS_SUPER_MAGIC && !getuid()) { jdm_fshandle_t *fshandle; - xfs_bstat_t bstat; - xfs_fsop_bulkreq_t bulkreq; + struct xfs_bstat bstat; + struct xfs_fsop_bulkreq bulkreq; xfs_ino_t ino; char *dirpath; @@ -903,8 +903,8 @@ static int test_append(const char *dir) if (stfs.f_type == XFS_SUPER_MAGIC && !getuid()) { jdm_fshandle_t *fshandle; - xfs_bstat_t bstat; - xfs_fsop_bulkreq_t bulkreq; + struct xfs_bstat bstat; + struct xfs_fsop_bulkreq bulkreq; xfs_ino_t ino; char *dirpath; @@ -1288,8 +1288,8 @@ static int test_append(const char *dir) if (stfs.f_type == XFS_SUPER_MAGIC && !getuid()) { jdm_fshandle_t *fshandle; - xfs_bstat_t bstat; - xfs_fsop_bulkreq_t bulkreq; + struct xfs_bstat bstat; + struct xfs_fsop_bulkreq bulkreq; xfs_ino_t ino; char *dirpath;