libxfs: remove unused cruft

Remove many unused #defines and functions.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/libxfs.h b/include/libxfs.h
index 2bdef706fffd8a980d3ed4444bfedf6ad666eb30..230bc3e8b0eb9617e8487f9149b83b35060a0c80 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -154,9 +154,6 @@ extern int  libxfs_log_header(char *, uuid_t *, int, int, int, xfs_lsn_t,
 extern int     libxfs_alloc_file_space (struct xfs_inode *, xfs_off_t,
                                xfs_off_t, int, int);
 
-extern void    libxfs_fs_repair_cmn_err(int, struct xfs_mount *, char *, ...);
-extern void    libxfs_fs_cmn_err(int, struct xfs_mount *, char *, ...);
-
 /* XXX: this is messy and needs fixing */
 #ifndef __LIBXFS_INTERNAL_XFS_H__
 extern void cmn_err(int, char *, ...);

diff --git a/include/xfs_trans.h b/include/xfs_trans.h
index 832bde104b100ecce4e2ce6d2d5ed0f3f2aace3f..10b745381c13398406fed7e87b1e9b4d9839fc47 100644 (file)
--- a/include/xfs_trans.h
+++ b/include/xfs_trans.h
@@ -47,13 +47,6 @@ typedef struct xfs_buf_log_item {
 #define XFS_BLI_STALE                  (1<<2)
 #define XFS_BLI_INODE_ALLOC_BUF                (1<<3)
 
-typedef struct xfs_dq_logitem {
-       xfs_log_item_t          qli_item;       /* common portion */
-       struct xfs_dquot        *qli_dquot;     /* dquot ptr */
-       xfs_lsn_t               qli_flush_lsn;  /* lsn at last flush */
-       xfs_dq_logformat_t      qli_format;     /* logged structure */
-} xfs_dq_logitem_t;
-
 typedef struct xfs_qoff_logitem {
        xfs_log_item_t          qql_item;       /* common portion */
        struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */
@@ -64,7 +57,6 @@ typedef struct xfs_qoff_logitem {
 #define XFS_DEFER_OPS_NR_BUFS  2       /* join up to two buffers */
 
 typedef struct xfs_trans {
-       unsigned int    t_type;                 /* transaction type */
        unsigned int    t_log_res;              /* amt of log space resvd */
        unsigned int    t_log_count;            /* count for perm log res */
        unsigned int    t_blk_res;              /* # of blocks resvd */
@@ -98,7 +90,6 @@ void xfs_defer_cancel(struct xfs_trans *);
 struct xfs_buf *libxfs_trans_getsb(struct xfs_trans *, struct xfs_mount *, int);
 
 void   libxfs_trans_ijoin(struct xfs_trans *, struct xfs_inode *, uint);
-void   libxfs_trans_ijoin_ref(struct xfs_trans *, struct xfs_inode *, int);
 void   libxfs_trans_log_inode (struct xfs_trans *, struct xfs_inode *,
                                uint);
 int    libxfs_trans_roll_inode (struct xfs_trans **, struct xfs_inode *);

diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index bb0f07bdb90176b0c0d685ba6368f291c27b3ab9..1150ec9316093902a9e019989f7fc3f75e1c8058 100644 (file)
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -16,9 +16,6 @@
 #define xfs_highbit32                  libxfs_highbit32
 #define xfs_highbit64                  libxfs_highbit64
 
-#define xfs_fs_repair_cmn_err          libxfs_fs_repair_cmn_err
-#define xfs_fs_cmn_err                 libxfs_fs_cmn_err
-
 #define xfs_trans_alloc                        libxfs_trans_alloc
 #define xfs_trans_alloc_empty          libxfs_trans_alloc_empty
 #define xfs_trans_add_item             libxfs_trans_add_item
@@ -61,7 +58,6 @@
 #define xfs_bmapi_write                        libxfs_bmapi_write
 #define xfs_bmapi_read                 libxfs_bmapi_read
 #define xfs_bunmapi                    libxfs_bunmapi
-#define xfs_bmbt_get_all               libxfs_bmbt_get_all
 #define xfs_rtfree_extent              libxfs_rtfree_extent
 #define xfs_verify_rtbno               libxfs_verify_rtbno
 #define xfs_verify_ino                 libxfs_verify_ino
@@ -70,7 +66,6 @@
 #define xfs_defer_finish               libxfs_defer_finish
 #define xfs_defer_cancel               libxfs_defer_cancel
 
-#define xfs_da_brelse                  libxfs_da_brelse
 #define xfs_da_hashname                        libxfs_da_hashname
 #define xfs_da_shrink_inode            libxfs_da_shrink_inode
 #define xfs_da_read_buf                        libxfs_da_read_buf

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index a2a83884b68b98274340d12ceba77de818f2d28f..d668a157d33aa2cf17ba1c39a52b89935d6ae5a0 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -122,7 +122,6 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
 #define xfs_warn(mp,fmt,args...)               cmn_err(CE_WARN,fmt, ## args)
 #define xfs_err(mp,fmt,args...)                        cmn_err(CE_ALERT,fmt, ## args)
 #define xfs_alert(mp,fmt,args...)              cmn_err(CE_ALERT,fmt, ## args)
-#define xfs_alert_tag(mp,tag,fmt,args...)      cmn_err(CE_ALERT,fmt, ## args)
 
 #define xfs_hex_dump(d,n)              ((void) 0)
 #define xfs_stack_trace()              ((void) 0)
@@ -195,8 +194,6 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
 #endif
 
 /* miscellaneous kernel routines not in user space */
-#define down_read(a)           ((void) 0)
-#define up_read(a)             ((void) 0)
 #define spin_lock_init(a)      ((void) 0)
 #define spin_lock(a)           ((void) 0)
 #define spin_unlock(a)         ((void) 0)
@@ -400,7 +397,6 @@ roundup_64(uint64_t x, uint32_t y)
 
 #define XBRW_READ                      LIBXFS_BREAD
 #define XBRW_WRITE                     LIBXFS_BWRITE
-#define xfs_buf_iomove(bp,off,len,data,f)      libxfs_iomove(bp,off,len,data,f)
 #define xfs_buf_zero(bp,off,len)     libxfs_iomove(bp,off,len,NULL,LIBXFS_BZERO)
 
 /* mount stuff */
@@ -436,8 +432,6 @@ roundup_64(uint64_t x, uint32_t y)
 #define xfs_sort                                       qsort
 
 #define xfs_ilock(ip,mode)                             ((void) 0)
-#define xfs_ilock_nowait(ip,mode)                      ((void) 0)
-#define xfs_ilock_demote(ip,mode)                      ((void) 0)
 #define xfs_ilock_data_map_shared(ip)                  (0)
 #define xfs_ilock_attr_map_shared(ip)                  (0)
 #define xfs_iunlock(ip,mode)                           ({      \
@@ -470,9 +464,6 @@ roundup_64(uint64_t x, uint32_t y)
 #define xfs_filestream_lookup_ag(ip)           (0)
 #define xfs_filestream_new_ag(ip,ag)           (0)
 
-#define xfs_log_force(mp,flags)                        ((void) 0)
-#define XFS_LOG_SYNC                           1
-
 /* quota bits */
 #define xfs_trans_mod_dquot_byino(t,i,f,d)             ((void) 0)
 #define xfs_trans_reserve_quota_nblks(t,i,b,n,f)       (0)

diff --git a/libxfs/trans.c b/libxfs/trans.c
index 64131b2989a65a23a98f0774f0033c210f039dd8..ee7904797d1f3d89aed55e2098d3054afbf5425f 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -359,21 +359,6 @@ libxfs_trans_ijoin(
 #endif
 }
 
-void
-libxfs_trans_ijoin_ref(
-       xfs_trans_t             *tp,
-       xfs_inode_t             *ip,
-       int                     lock_flags)
-{
-       ASSERT(ip->i_itemp != NULL);
-
-       xfs_trans_ijoin(tp, ip, lock_flags);
-
-#ifdef XACT_DEBUG
-       fprintf(stderr, "ijoin_ref'd inode %llu, transaction %p\n", ip->i_ino, tp);
-#endif
-}
-
 void
 libxfs_trans_inode_alloc_buf(
        xfs_trans_t             *tp,

diff --git a/libxfs/util.c b/libxfs/util.c
index 9fe9a3672fa537ee34e7d6db80787340de141b6e..8c9954f6d9824a51f617af50f7644201b858f078 100644 (file)
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -603,35 +603,6 @@ libxfs_inode_alloc(
        return error;
 }
 
-/*
- * Userspace versions of common diagnostic routines (varargs fun).
- */
-void
-libxfs_fs_repair_cmn_err(int level, xfs_mount_t *mp, char *fmt, ...)
-{
-       va_list ap;
-
-       va_start(ap, fmt);
-       vfprintf(stderr, fmt, ap);
-       fprintf(stderr, "  This is a bug.\n");
-       fprintf(stderr, "%s version %s\n", progname, VERSION);
-       fprintf(stderr,
-               "Please capture the filesystem metadata with xfs_metadump and\n"
-               "report it to linux-xfs@vger.kernel.org\n");
-       va_end(ap);
-}
-
-void
-libxfs_fs_cmn_err(int level, xfs_mount_t *mp, char *fmt, ...)
-{
-       va_list ap;
-
-       va_start(ap, fmt);
-       vfprintf(stderr, fmt, ap);
-       fputs("\n", stderr);
-       va_end(ap);
-}
-
 void
 cmn_err(int level, char *fmt, ...)
 {