[XFS] Remove dead code. Patch from Adrian Bunk
authorChristoph Hellwig <hch@sgi.com>
Tue, 21 Jun 2005 05:36:00 +0000 (15:36 +1000)
committerNathan Scott <nathans@sgi.com>
Tue, 21 Jun 2005 05:36:00 +0000 (15:36 +1000)
SGI-PV: 936255
SGI-Modid: xfs-linux:xfs-kern:192759a

Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
fs/xfs/quota/xfs_dquot.c
fs/xfs/quota/xfs_dquot.h
fs/xfs/xfs_bmap_btree.c
fs/xfs/xfs_bmap_btree.h
fs/xfs/xfs_fsops.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_rename.c
fs/xfs/xfs_trans.c
fs/xfs/xfs_trans.h
fs/xfs/xfs_trans_inode.c

index 740d20d331874cee3bec1c0d2257f08629747acb..c961ef7d847c345a4c64ef797bea345d64134656 100644 (file)
@@ -370,68 +370,6 @@ xfs_qm_adjust_dqtimers(
        }
 }
 
-/*
- * Increment or reset warnings of a given dquot.
- */
-int
-xfs_qm_dqwarn(
-       xfs_disk_dquot_t        *d,
-       uint                    flags)
-{
-       int     warned;
-
-       /*
-        * root's limits are not real limits.
-        */
-       if (!d->d_id)
-               return (0);
-
-       warned = 0;
-       if (INT_GET(d->d_blk_softlimit, ARCH_CONVERT) &&
-           (INT_GET(d->d_bcount, ARCH_CONVERT) >=
-            INT_GET(d->d_blk_softlimit, ARCH_CONVERT))) {
-               if (flags & XFS_QMOPT_DOWARN) {
-                       INT_MOD(d->d_bwarns, ARCH_CONVERT, +1);
-                       warned++;
-               }
-       } else {
-               if (!d->d_blk_softlimit ||
-                   (INT_GET(d->d_bcount, ARCH_CONVERT) <
-                    INT_GET(d->d_blk_softlimit, ARCH_CONVERT))) {
-                       d->d_bwarns = 0;
-               }
-       }
-
-       if (INT_GET(d->d_ino_softlimit, ARCH_CONVERT) > 0 &&
-           (INT_GET(d->d_icount, ARCH_CONVERT) >=
-            INT_GET(d->d_ino_softlimit, ARCH_CONVERT))) {
-               if (flags & XFS_QMOPT_DOWARN) {
-                       INT_MOD(d->d_iwarns, ARCH_CONVERT, +1);
-                       warned++;
-               }
-       } else {
-               if (!d->d_ino_softlimit ||
-                   (INT_GET(d->d_icount, ARCH_CONVERT) <
-                    INT_GET(d->d_ino_softlimit, ARCH_CONVERT))) {
-                       d->d_iwarns = 0;
-               }
-       }
-#ifdef QUOTADEBUG
-       if (INT_GET(d->d_iwarns, ARCH_CONVERT))
-               cmn_err(CE_DEBUG,
-                       "--------@@Inode warnings running : %Lu >= %Lu",
-                       INT_GET(d->d_icount, ARCH_CONVERT),
-                       INT_GET(d->d_ino_softlimit, ARCH_CONVERT));
-       if (INT_GET(d->d_bwarns, ARCH_CONVERT))
-               cmn_err(CE_DEBUG,
-                       "--------@@Blks warnings running : %Lu >= %Lu",
-                       INT_GET(d->d_bcount, ARCH_CONVERT),
-                       INT_GET(d->d_blk_softlimit, ARCH_CONVERT));
-#endif
-       return (warned);
-}
-
-
 /*
  * initialize a buffer full of dquots and log the whole thing
  */
index 0c3fe3175baa4a125c83dfaa3a3e3b6fc3de9d50..35aeeafe4799fb63a88c88ebf0ff2275c47af2d8 100644 (file)
@@ -211,7 +211,6 @@ extern void         xfs_qm_adjust_dqtimers(xfs_mount_t *,
                                        xfs_disk_dquot_t *);
 extern void            xfs_qm_adjust_dqlimits(xfs_mount_t *,
                                        xfs_disk_dquot_t *);
-extern int             xfs_qm_dqwarn(xfs_disk_dquot_t *, uint);
 extern int             xfs_qm_dqget(xfs_mount_t *, xfs_inode_t *,
                                        xfs_dqid_t, uint, uint, xfs_dquot_t **);
 extern void            xfs_qm_dqput(xfs_dquot_t *);
index 163305a79fcc583cac98d43ce8c21ba1bc0a3fd9..09c413576ba81b838254837c3f708ca24797e88c 100644 (file)
@@ -2331,20 +2331,6 @@ xfs_bmbt_lookup_ge(
        return xfs_bmbt_lookup(cur, XFS_LOOKUP_GE, stat);
 }
 
-int                                    /* error */
-xfs_bmbt_lookup_le(
-       xfs_btree_cur_t *cur,
-       xfs_fileoff_t   off,
-       xfs_fsblock_t   bno,
-       xfs_filblks_t   len,
-       int             *stat)          /* success/failure */
-{
-       cur->bc_rec.b.br_startoff = off;
-       cur->bc_rec.b.br_startblock = bno;
-       cur->bc_rec.b.br_blockcount = len;
-       return xfs_bmbt_lookup(cur, XFS_LOOKUP_LE, stat);
-}
-
 /*
  * Give the bmap btree a new root block.  Copy the old broot contents
  * down into a real block and make the broot point to it.
index 843ff12b4bf22307d6f5db24b64051c3efaef7b1..0a40cf126c285cfb940b5915f898722fc6ca1ea3 100644 (file)
@@ -580,14 +580,6 @@ xfs_bmbt_lookup_ge(
        xfs_filblks_t,
        int *);
 
-int
-xfs_bmbt_lookup_le(
-       struct xfs_btree_cur *,
-       xfs_fileoff_t,
-       xfs_fsblock_t,
-       xfs_filblks_t,
-       int *);
-
 /*
  * Give the bmap btree a new root block.  Copy the old broot contents
  * down into a real block and make the broot point to it.
index 21213057c27f9ff655100f986cd7ad49d930b619..ca535d613190fca9ac1a15df62713223d4a69825 100644 (file)
@@ -559,32 +559,6 @@ xfs_reserve_blocks(
        return(0);
 }
 
-void
-xfs_fs_log_dummy(xfs_mount_t *mp)
-{
-       xfs_trans_t *tp;
-       xfs_inode_t *ip;
-
-
-       tp = _xfs_trans_alloc(mp, XFS_TRANS_DUMMY1);
-       atomic_inc(&mp->m_active_trans);
-       if (xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0)) {
-               xfs_trans_cancel(tp, 0);
-               return;
-       }
-
-       ip = mp->m_rootip;
-       xfs_ilock(ip, XFS_ILOCK_EXCL);
-
-       xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
-       xfs_trans_ihold(tp, ip);
-       xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
-       xfs_trans_set_sync(tp);
-       xfs_trans_commit(tp, 0, NULL);
-
-       xfs_iunlock(ip, XFS_ILOCK_EXCL);
-}
-
 int
 xfs_fs_goingdown(
        xfs_mount_t     *mp,
index bc8c8c7f9039d507978d727a25c446b661af4d56..e8274d6b7237bdf5990761eaf62a2754487ee97f 100644 (file)
@@ -145,51 +145,6 @@ xfs_inobp_check(
 }
 #endif
 
-/*
- * called from bwrite on xfs inode buffers
- */
-void
-xfs_inobp_bwcheck(xfs_buf_t *bp)
-{
-       xfs_mount_t     *mp;
-       int             i;
-       int             j;
-       xfs_dinode_t    *dip;
-
-       ASSERT(XFS_BUF_FSPRIVATE3(bp, void *) != NULL);
-
-       mp = XFS_BUF_FSPRIVATE3(bp, xfs_mount_t *);
-
-
-       j = mp->m_inode_cluster_size >> mp->m_sb.sb_inodelog;
-
-       for (i = 0; i < j; i++)  {
-               dip = (xfs_dinode_t *) xfs_buf_offset(bp,
-                                               i * mp->m_sb.sb_inodesize);
-               if (INT_GET(dip->di_core.di_magic, ARCH_CONVERT) != XFS_DINODE_MAGIC) {
-                       cmn_err(CE_WARN,
-"Bad magic # 0x%x in XFS inode buffer 0x%Lx, starting blockno %Ld, offset 0x%x",
-                               INT_GET(dip->di_core.di_magic, ARCH_CONVERT),
-                               (__uint64_t)(__psunsigned_t) bp,
-                               (__int64_t) XFS_BUF_ADDR(bp),
-                               xfs_buf_offset(bp, i * mp->m_sb.sb_inodesize));
-                       xfs_fs_cmn_err(CE_WARN, mp,
-                               "corrupt, unmount and run xfs_repair");
-               }
-               if (!dip->di_next_unlinked)  {
-                       cmn_err(CE_WARN,
-"Bad next_unlinked field (0) in XFS inode buffer 0x%p, starting blockno %Ld, offset 0x%x",
-                               (__uint64_t)(__psunsigned_t) bp,
-                               (__int64_t) XFS_BUF_ADDR(bp),
-                               xfs_buf_offset(bp, i * mp->m_sb.sb_inodesize));
-                       xfs_fs_cmn_err(CE_WARN, mp,
-                               "corrupt, unmount and run xfs_repair");
-               }
-       }
-
-       return;
-}
-
 /*
  * This routine is called to map an inode number within a file
  * system to the buffer containing the on-disk version of the
index cb13f9a1d45ba43aa20bd016a92b564370ed89ad..23b48ac1cb7e5fb9ff73e1f041f8cbf37d9ef38b 100644 (file)
@@ -234,9 +234,6 @@ xfs_lock_for_rename(
        return 0;
 }
 
-
-int rename_which_error_return = 0;
-
 /*
  * xfs_rename
  */
@@ -316,7 +313,6 @@ xfs_rename(
                        &num_inodes);
 
        if (error) {
-               rename_which_error_return = __LINE__;
                /*
                 * We have nothing locked, no inode references, and
                 * no transaction, so just get out.
@@ -332,7 +328,6 @@ xfs_rename(
                 */
                if (target_ip == NULL && (src_dp != target_dp) &&
                    target_dp->i_d.di_nlink >= XFS_MAXLINK) {
-                       rename_which_error_return = __LINE__;
                        error = XFS_ERROR(EMLINK);
                        xfs_rename_unlock4(inodes, XFS_ILOCK_SHARED);
                        goto rele_return;
@@ -359,7 +354,6 @@ xfs_rename(
                                XFS_TRANS_PERM_LOG_RES, XFS_RENAME_LOG_COUNT);
        }
        if (error) {
-               rename_which_error_return = __LINE__;
                xfs_trans_cancel(tp, 0);
                goto rele_return;
        }
@@ -369,7 +363,6 @@ xfs_rename(
         */
        if ((error = XFS_QM_DQVOPRENAME(mp, inodes))) {
                xfs_trans_cancel(tp, cancel_flags);
-               rename_which_error_return = __LINE__;
                goto rele_return;
        }
 
@@ -413,7 +406,6 @@ xfs_rename(
                if (spaceres == 0 &&
                    (error = XFS_DIR_CANENTER(mp, tp, target_dp, target_name,
                                target_namelen))) {
-                       rename_which_error_return = __LINE__;
                        goto error_return;
                }
                /*
@@ -425,11 +417,9 @@ xfs_rename(
                                           target_namelen, src_ip->i_ino,
                                           &first_block, &free_list, spaceres);
                if (error == ENOSPC) {
-                       rename_which_error_return = __LINE__;
                        goto error_return;
                }
                if (error) {
-                       rename_which_error_return = __LINE__;
                        goto abort_return;
                }
                xfs_ichgtime(target_dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
@@ -437,7 +427,6 @@ xfs_rename(
                if (new_parent && src_is_directory) {
                        error = xfs_bumplink(tp, target_dp);
                        if (error) {
-                               rename_which_error_return = __LINE__;
                                goto abort_return;
                        }
                }
@@ -455,7 +444,6 @@ xfs_rename(
                        if (!(XFS_DIR_ISEMPTY(target_ip->i_mount, target_ip)) ||
                            (target_ip->i_d.di_nlink > 2)) {
                                error = XFS_ERROR(EEXIST);
-                               rename_which_error_return = __LINE__;
                                goto error_return;
                        }
                }
@@ -473,7 +461,6 @@ xfs_rename(
                        target_namelen, src_ip->i_ino, &first_block,
                        &free_list, spaceres);
                if (error) {
-                       rename_which_error_return = __LINE__;
                        goto abort_return;
                }
                xfs_ichgtime(target_dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
@@ -484,7 +471,6 @@ xfs_rename(
                 */
                error = xfs_droplink(tp, target_ip);
                if (error) {
-                       rename_which_error_return = __LINE__;
                        goto abort_return;
                }
                target_ip_dropped = 1;
@@ -495,7 +481,6 @@ xfs_rename(
                         */
                        error = xfs_droplink(tp, target_ip);
                        if (error) {
-                               rename_which_error_return = __LINE__;
                                goto abort_return;
                        }
                }
@@ -519,7 +504,6 @@ xfs_rename(
                                        &free_list, spaceres);
                ASSERT(error != EEXIST);
                if (error) {
-                       rename_which_error_return = __LINE__;
                        goto abort_return;
                }
                xfs_ichgtime(src_ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
@@ -550,7 +534,6 @@ xfs_rename(
                 */
                error = xfs_droplink(tp, src_dp);
                if (error) {
-                       rename_which_error_return = __LINE__;
                        goto abort_return;
                }
        }
@@ -558,7 +541,6 @@ xfs_rename(
        error = XFS_DIR_REMOVENAME(mp, tp, src_dp, src_name, src_namelen,
                        src_ip->i_ino, &first_block, &free_list, spaceres);
        if (error) {
-               rename_which_error_return = __LINE__;
                goto abort_return;
        }
        xfs_ichgtime(src_dp, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
index 3db0e22007759c076b0ed561270203af3dedd026..a865f6035991bafde83147f3eeabe90ec786c9ab 100644 (file)
@@ -331,25 +331,6 @@ undo_blocks:
 }
 
 
-/*
- * This is called to set the a callback to be called when the given
- * transaction is committed to disk.  The transaction pointer and the
- * argument pointer will be passed to the callback routine.
- *
- * Only one callback can be associated with any single transaction.
- */
-void
-xfs_trans_callback(
-       xfs_trans_t             *tp,
-       xfs_trans_callback_t    callback,
-       void                    *arg)
-{
-       ASSERT(tp->t_callback == NULL);
-       tp->t_callback = callback;
-       tp->t_callarg = arg;
-}
-
-
 /*
  * Record the indicated change to the given field for application
  * to the file system's superblock when the transaction commits.
index bd37ccb85e76d30f98d2d61e6c7b79b47a4d9f26..ec541d66fa2a47309a8ec76523435d3756edf71e 100644 (file)
@@ -987,8 +987,6 @@ xfs_trans_t *_xfs_trans_alloc(struct xfs_mount *, uint);
 xfs_trans_t    *xfs_trans_dup(xfs_trans_t *);
 int            xfs_trans_reserve(xfs_trans_t *, uint, uint, uint,
                                  uint, uint);
-void           xfs_trans_callback(xfs_trans_t *,
-                                  void (*)(xfs_trans_t *, void *), void *);
 void           xfs_trans_mod_sb(xfs_trans_t *, uint, long);
 struct xfs_buf *xfs_trans_get_buf(xfs_trans_t *, struct xfs_buftarg *, xfs_daddr_t,
                                   int, uint);
@@ -1010,7 +1008,6 @@ int               xfs_trans_iget(struct xfs_mount *, xfs_trans_t *,
                               xfs_ino_t , uint, uint, struct xfs_inode **);
 void           xfs_trans_ijoin(xfs_trans_t *, struct xfs_inode *, uint);
 void           xfs_trans_ihold(xfs_trans_t *, struct xfs_inode *);
-void           xfs_trans_ihold_release(xfs_trans_t *, struct xfs_inode *);
 void           xfs_trans_log_buf(xfs_trans_t *, struct xfs_buf *, uint, uint);
 void           xfs_trans_log_inode(xfs_trans_t *, struct xfs_inode *, uint);
 struct xfs_efi_log_item        *xfs_trans_get_efi(xfs_trans_t *, uint);
index e2c3706f453de78c9b9063a87733f7d3f87d8618..7e7631ca49793b6ad8b2cad24d3a0e9ab530f442 100644 (file)
@@ -253,24 +253,6 @@ xfs_trans_ihold(
        ip->i_itemp->ili_flags |= XFS_ILI_HOLD;
 }
 
-/*
- * Cancel the previous inode hold request made on this inode
- * for this transaction.
- */
-/*ARGSUSED*/
-void
-xfs_trans_ihold_release(
-       xfs_trans_t     *tp,
-       xfs_inode_t     *ip)
-{
-       ASSERT(ip->i_transp == tp);
-       ASSERT(ip->i_itemp != NULL);
-       ASSERT(ismrlocked(&ip->i_lock, MR_UPDATE));
-       ASSERT(ip->i_itemp->ili_flags & XFS_ILI_HOLD);
-
-       ip->i_itemp->ili_flags &= ~XFS_ILI_HOLD;
-}
-
 
 /*
  * This is called to mark the fields indicated in fieldmask as needing