[PATCH] xfsprogs: kill unused files db/dbread.[ch]

Christoph Hellwig hch at infradead.org
Sun Nov 30 03:24:22 CST 2008


Signed-off-by: Christoph Hellwig <hch at lst.de>

Index: xfs-cmds/xfsprogs/db/Makefile
===================================================================
--- xfs-cmds.orig/xfsprogs/db/Makefile	2008-11-28 14:12:02.000000000 +0530
+++ xfs-cmds/xfsprogs/db/Makefile	2008-11-28 14:12:06.000000000 +0530
@@ -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 \
Index: xfs-cmds/xfsprogs/db/dbread.c
===================================================================
--- xfs-cmds.orig/xfsprogs/db/dbread.c	2008-11-28 14:12:31.000000000 +0530
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -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;
-}
Index: xfs-cmds/xfsprogs/db/dbread.h
===================================================================
--- xfs-cmds.orig/xfsprogs/db/dbread.h	2008-11-28 14:12:36.000000000 +0530
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -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);




More information about the xfs mailing list