kill unused files db/dbread.[ch]

Merge of master-melb:xfs-cmds:32617a by kenmcd.

  kill unused files db/dbread.[ch]

diff --git a/db/Makefile b/db/Makefile
index 125c4c56687ebaa18fcaa968e3943932460c48ee..3ed5759b09c58526f55836f8fe0ee88de385cb34 100644 (file)
--- a/db/Makefile
+++ b/db/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/include/builddefs
 LTCOMMAND = xfs_db
 
 HFILES = addr.h agf.h agfl.h agi.h attr.h attrshort.h bit.h block.h bmap.h \
-       btblock.h bmroot.h check.h command.h convert.h dbread.h debug.h \
+       btblock.h bmroot.h check.h command.h convert.h debug.h \
        dir.h dir2.h dir2sf.h dirshort.h dquot.h echo.h faddr.h field.h \
        flist.h fprint.h frag.h freesp.h hash.h help.h init.h inode.h input.h \
        io.h malloc.h metadump.h output.h print.h quit.h sb.h sig.h strvec.h \

diff --git a/db/dbread.c b/db/dbread.c
deleted file mode 100644 (file)
index e2f760c..0000000
--- a/db/dbread.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <xfs/libxfs.h>
-#include "bmap.h"
-#include "dbread.h"
-#include "io.h"
-#include "init.h"
-
-int
-dbread(void *buf, int nblocks, xfs_fileoff_t bno, int whichfork)
-{
-       bmap_ext_t      bm;
-       char            *bp;
-       xfs_dfiloff_t   eb;
-       xfs_dfiloff_t   end;
-       int             i;
-       int             nex;
-
-       nex = 1;
-       end = bno + nblocks;
-       bp = buf;
-       while (bno < end) {
-               bmap(bno, end - bno, whichfork, &nex, &bm);
-               if (nex == 0) {
-                       bm.startoff = end;
-                       bm.blockcount = 1;
-               }
-               if (bm.startoff > bno) {
-                       eb = end < bm.startoff ? end : bm.startoff;
-                       i = (int)XFS_FSB_TO_B(mp, eb - bno);
-                       memset(bp, 0, i);
-                       bp += i;
-                       bno = eb;
-               }
-               if (bno == end)
-                       break;
-               if (bno > bm.startoff) {
-                       bm.blockcount -= bno - bm.startoff;
-                       bm.startblock += bno - bm.startoff;
-                       bm.startoff = bno;
-               }
-               if (bm.startoff + bm.blockcount > end)
-                       bm.blockcount = end - bm.startoff;
-               i = read_bbs(XFS_FSB_TO_DADDR(mp, bm.startblock),
-                            (int)XFS_FSB_TO_BB(mp, bm.blockcount),
-                            (void **)&bp, NULL);
-               if (i)
-                       return i;
-               bp += XFS_FSB_TO_B(mp, bm.blockcount);
-               bno += bm.blockcount;
-       }
-       return 0;
-}

diff --git a/db/dbread.h b/db/dbread.h
deleted file mode 100644 (file)
index ed26ec4..0000000
--- a/db/dbread.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2000-2001,2005 Silicon Graphics, Inc.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-extern int     dbread(void *buf, int nblocks, xfs_fileoff_t bno,
-                      int whichfork);