From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 2/2] xfsprogs: remove unused functions
Date: Wed, 10 Oct 2018 18:10:23 +1100 [thread overview]
Message-ID: <20181010071023.6765-3-david@fromorbit.com> (raw)
In-Reply-To: <20181010071023.6765-1-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Clean up build warnings about defined by not used functions by
removing them.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
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
--
2.17.0
next prev parent reply other threads:[~2018-10-10 14:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 7:10 [PATCH 0/2] xfsprogs: build fixes for 4.19.0-rc0 Dave Chinner
2018-10-10 7:10 ` [PATCH 1/2] xfsprogs: document changes " Dave Chinner
2018-10-10 13:46 ` Eric Sandeen
2018-10-10 21:27 ` Dave Chinner
2018-10-10 14:44 ` Darrick J. Wong
2018-10-10 7:10 ` Dave Chinner [this message]
2018-10-10 13:17 ` [PATCH 2/2] xfsprogs: remove unused functions Carlos Maiolino
2018-10-10 13:48 ` Eric Sandeen
2018-10-10 14:44 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181010071023.6765-3-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).