From patchwork Wed Oct 10 07:10:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Chinner X-Patchwork-Id: 10634083 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 F16495CAF for ; Wed, 10 Oct 2018 07:10:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF736298C7 for ; Wed, 10 Oct 2018 07:10:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1FAC298F8; Wed, 10 Oct 2018 07:10:31 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 7BE09298C7 for ; Wed, 10 Oct 2018 07:10:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726479AbeJJObR (ORCPT ); Wed, 10 Oct 2018 10:31:17 -0400 Received: from ipmail06.adl2.internode.on.net ([150.101.137.129]:53652 "EHLO ipmail06.adl2.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725837AbeJJObR (ORCPT ); Wed, 10 Oct 2018 10:31:17 -0400 Received: from ppp59-167-129-252.static.internode.on.net (HELO dastard) ([59.167.129.252]) by ipmail06.adl2.internode.on.net with ESMTP; 10 Oct 2018 17:40:28 +1030 Received: from discord.disaster.area ([192.168.1.111]) by dastard with esmtp (Exim 4.80) (envelope-from ) id 1gA8dX-0002GG-JV for linux-xfs@vger.kernel.org; Wed, 10 Oct 2018 18:10:27 +1100 Received: from dave by discord.disaster.area with local (Exim 4.91) (envelope-from ) id 1gA8dX-0001mG-IM for linux-xfs@vger.kernel.org; Wed, 10 Oct 2018 18:10:27 +1100 From: Dave Chinner To: linux-xfs@vger.kernel.org Subject: [PATCH 1/2] xfsprogs: document changes for 4.19.0-rc0 Date: Wed, 10 Oct 2018 18:10:22 +1100 Message-Id: <20181010071023.6765-2-david@fromorbit.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20181010071023.6765-1-david@fromorbit.com> References: <20181010071023.6765-1-david@fromorbit.com> 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: Dave Chinner Because 'make deb' breaks without them. Signed-off-by: Dave Chinner Reviewed-by: Eric Sandeen --- debian/changelog | 7 +++++++ doc/CHANGES | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 01639f9efeec..ef129e278948 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xfsprogs (4.19.0-rc0-1) unstable; urgency=low + + * New upstream pre-release + * Merge libxfs changes from kernel-4.19 + + -- Nathan Scott Wed, 10 Oct 2018 17:52:48 +1100 + xfsprogs (4.18.0-1) unstable; urgency=low * New upstream release diff --git a/doc/CHANGES b/doc/CHANGES index 3c1e39469008..1c41bd90a1c5 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,10 @@ +xfsprogs-4.18.0-rc0 (10 Oct 2018) + - Majority of 4.18 libxfs changes merged from kernel + - Big sparse static checker cleanup (Eric Sandeen) + - mkfs.xfs discard fixes (Jan Tulak) + - xfs_io readv/writev cleanup (Zorro Lang) + - libxfs transaction commit error checking (Darrick Wong) + xfsprogs-4.18.0 (24 Aug 2018) - Tweak SPDX license in xfs_cksum.h (Darrick Wong) From patchwork Wed Oct 10 07:10:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Chinner X-Patchwork-Id: 10634081 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 5A0BF69B4 for ; Wed, 10 Oct 2018 07:10:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9309296B4 for ; Wed, 10 Oct 2018 07:10:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDBBE298F9; Wed, 10 Oct 2018 07:10:34 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 747AF298F2 for ; Wed, 10 Oct 2018 07:10:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726579AbeJJObU (ORCPT ); Wed, 10 Oct 2018 10:31:20 -0400 Received: from ipmail06.adl2.internode.on.net ([150.101.137.129]:38939 "EHLO ipmail06.adl2.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725837AbeJJObU (ORCPT ); Wed, 10 Oct 2018 10:31:20 -0400 Received: from ppp59-167-129-252.static.internode.on.net (HELO dastard) ([59.167.129.252]) by ipmail06.adl2.internode.on.net with ESMTP; 10 Oct 2018 17:40:28 +1030 Received: from discord.disaster.area ([192.168.1.111]) by dastard with esmtp (Exim 4.80) (envelope-from ) id 1gA8dX-0002GH-KL for linux-xfs@vger.kernel.org; Wed, 10 Oct 2018 18:10:27 +1100 Received: from dave by discord.disaster.area with local (Exim 4.91) (envelope-from ) id 1gA8dX-0001mJ-JF for linux-xfs@vger.kernel.org; Wed, 10 Oct 2018 18:10:27 +1100 From: Dave Chinner To: linux-xfs@vger.kernel.org Subject: [PATCH 2/2] xfsprogs: remove unused functions Date: Wed, 10 Oct 2018 18:10:23 +1100 Message-Id: <20181010071023.6765-3-david@fromorbit.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20181010071023.6765-1-david@fromorbit.com> References: <20181010071023.6765-1-david@fromorbit.com> 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: Dave Chinner Clean up build warnings about defined by not used functions by removing them. Signed-off-by: Dave Chinner Reviewed-by: Carlos Maiolino Reviewed-by: Eric Sandeen Reviewed-by: Darrick J. Wong --- libxfs/rdwr.c | 8 ------- libxfs/util.c | 63 -------------------------------------------------- repair/btree.c | 23 ------------------ 3 files changed, 94 deletions(-) diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index 753b9396fbe5..e580aba1d7ee 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -544,14 +544,6 @@ libxfs_bcompare(struct cache_node *node, cache_key_t key) return CACHE_MISS; } -static void -libxfs_bprint(xfs_buf_t *bp) -{ - fprintf(stderr, "Buffer %p blkno=%llu bytes=%u flags=0x%x count=%u\n", - bp, (unsigned long long)bp->b_bn, (unsigned)bp->b_bcount, - bp->b_flags, bp->b_node.cn_count); -} - static void __initbuf(xfs_buf_t *bp, struct xfs_buftarg *btp, xfs_daddr_t bno, unsigned int bytes) diff --git a/libxfs/util.c b/libxfs/util.c index 993218615d00..ffd265094b4c 100644 --- a/libxfs/util.c +++ b/libxfs/util.c @@ -380,69 +380,6 @@ libxfs_ialloc( return 0; } -static void -libxfs_iprint( - xfs_inode_t *ip) -{ - struct xfs_icdinode *dip; - xfs_extnum_t i = 0; - struct xfs_ifork *ifp; /* inode fork pointer */ - struct xfs_iext_cursor icur; - xfs_bmbt_irec_t rec; - - printf("Inode %lx\n", (unsigned long)ip); - printf(" i_ino %llx\n", (unsigned long long)ip->i_ino); - - if (ip->i_df.if_flags & XFS_IFEXTENTS) - printf("EXTENTS "); - printf("\n"); - printf(" i_df.if_bytes %d\n", ip->i_df.if_bytes); - printf(" i_df.if_u1.if_root/if_data %lx\n", - (unsigned long)ip->i_df.if_u1.if_root); - if (ip->i_df.if_flags & XFS_IFEXTENTS) { - ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK); - for_each_xfs_iext(ifp, &icur, &rec) { - printf("\t%d: startoff %llu, startblock 0x%llx," - " blockcount %llu, state %d\n", - i, (unsigned long long)rec.br_startoff, - (unsigned long long)rec.br_startblock, - (unsigned long long)rec.br_blockcount, - (int)rec.br_state); - i++; - } - } - printf(" i_df.if_broot %lx\n", (unsigned long)ip->i_df.if_broot); - printf(" i_df.if_broot_bytes %x\n", ip->i_df.if_broot_bytes); - - dip = &ip->i_d; - printf("\nOn disk portion\n"); - printf(" di_mode %o\n", VFS_I(ip)->i_mode); - printf(" di_version %x\n", (uint)dip->di_version); - switch (ip->i_d.di_format) { - case XFS_DINODE_FMT_LOCAL: - printf(" Inline inode\n"); - break; - case XFS_DINODE_FMT_EXTENTS: - printf(" Extents inode\n"); - break; - case XFS_DINODE_FMT_BTREE: - printf(" B-tree inode\n"); - break; - default: - printf(" Other inode\n"); - break; - } - printf(" di_nlink %x\n", VFS_I(ip)->i_nlink); - printf(" di_uid %d\n", dip->di_uid); - printf(" di_gid %d\n", dip->di_gid); - printf(" di_nextents %d\n", dip->di_nextents); - printf(" di_size %llu\n", (unsigned long long)dip->di_size); - printf(" di_gen %x\n", VFS_I(ip)->i_generation); - printf(" di_extsize %d\n", dip->di_extsize); - printf(" di_flags %x\n", dip->di_flags); - printf(" di_nblocks %llu\n", (unsigned long long)dip->di_nblocks); -} - /* * Writes a modified inode's changes out to the inode's on disk home. * Originally based on xfs_iflush_int() from xfs_inode.c in the kernel. diff --git a/repair/btree.c b/repair/btree.c index a402d0a67349..292fa518d019 100644 --- a/repair/btree.c +++ b/repair/btree.c @@ -444,29 +444,6 @@ btree_lookup_prev( return value; } -static void * -btree_uncached_lookup( - struct btree_root *root, - unsigned long key) -{ - /* cursor-less (ie. uncached) lookup */ - int height = root->height - 1; - struct btree_node *node = root->root_node; - int i; - int key_found = 0; - - while (height >= 0) { - for (i = 0; i < node->num_keys; i++) - if (node->keys[i] >= key) { - key_found = node->keys[i] == key; - break; - } - node = node->ptrs[i]; - height--; - } - return key_found ? node : NULL; -} - /* Update functions */ static inline void