aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-06-09 01:29:22 -0400
committerNathan Scott <nathans@sgi.com>2006-06-09 01:29:22 -0400
commit9c48876a05b6fbe41f1933fae3529c268d78cad0 (patch)
treebecfedbde574228e6fb2a1d96721d78e9b0b4dc7
parentad723875ac238137207754d2633dd9c261c71558 (diff)
[XFS] Remove dead code from come bulkstat paths.
SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26102a Signed-off-by: Nathan Scott <nathans@sgi.com>
-rw-r--r--fs/xfs/quota/xfs_qm.c4
-rw-r--r--fs/xfs/xfs_itable.c16
-rw-r--r--fs/xfs/xfs_itable.h1
3 files changed, 1 insertions, 20 deletions
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index 492840b2a354..00fb54d48999 100644
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
@@ -1905,9 +1905,7 @@ xfs_qm_quotacheck(
1905 */ 1905 */
1906 if ((error = xfs_bulkstat(mp, &lastino, &count, 1906 if ((error = xfs_bulkstat(mp, &lastino, &count,
1907 xfs_qm_dqusage_adjust, NULL, 1907 xfs_qm_dqusage_adjust, NULL,
1908 structsz, NULL, 1908 structsz, NULL, BULKSTAT_FG_IGET, &done)))
1909 BULKSTAT_FG_IGET|BULKSTAT_FG_VFSLOCKED,
1910 &done)))
1911 break; 1909 break;
1912 1910
1913 } while (! done); 1911 } while (! done);
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 94068d014f27..864b43d65840 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -41,11 +41,6 @@
41#include "xfs_error.h" 41#include "xfs_error.h"
42#include "xfs_btree.h" 42#include "xfs_btree.h"
43 43
44#ifndef HAVE_USERACC
45#define useracc(ubuffer, size, flags, foo) (0)
46#define unuseracc(ubuffer, size, flags)
47#endif
48
49STATIC int 44STATIC int
50xfs_bulkstat_one_iget( 45xfs_bulkstat_one_iget(
51 xfs_mount_t *mp, /* mount point for filesystem */ 46 xfs_mount_t *mp, /* mount point for filesystem */
@@ -336,15 +331,6 @@ xfs_bulkstat(
336 nimask = ~(nicluster - 1); 331 nimask = ~(nicluster - 1);
337 nbcluster = nicluster >> mp->m_sb.sb_inopblog; 332 nbcluster = nicluster >> mp->m_sb.sb_inopblog;
338 /* 333 /*
339 * Lock down the user's buffer. If a buffer was not sent, as in the case
340 * disk quota code calls here, we skip this.
341 */
342 if (ubuffer &&
343 (error = useracc(ubuffer, ubcount * statstruct_size,
344 (B_READ|B_PHYS), NULL))) {
345 return error;
346 }
347 /*
348 * Allocate a page-sized buffer for inode btree records. 334 * Allocate a page-sized buffer for inode btree records.
349 * We could try allocating something smaller, but for normal 335 * We could try allocating something smaller, but for normal
350 * calls we'll always (potentially) need the whole page. 336 * calls we'll always (potentially) need the whole page.
@@ -650,8 +636,6 @@ xfs_bulkstat(
650 * Done, we're either out of filesystem or space to put the data. 636 * Done, we're either out of filesystem or space to put the data.
651 */ 637 */
652 kmem_free(irbuf, NBPC); 638 kmem_free(irbuf, NBPC);
653 if (ubuffer)
654 unuseracc(ubuffer, ubcount * statstruct_size, (B_READ|B_PHYS));
655 *ubcountp = ubelem; 639 *ubcountp = ubelem;
656 if (agno >= mp->m_sb.sb_agcount) { 640 if (agno >= mp->m_sb.sb_agcount) {
657 /* 641 /*
diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h
index 11eb4e1b18c4..be5f12e07d22 100644
--- a/fs/xfs/xfs_itable.h
+++ b/fs/xfs/xfs_itable.h
@@ -45,7 +45,6 @@ typedef int (*bulkstat_one_pf)(struct xfs_mount *mp,
45 */ 45 */
46#define BULKSTAT_FG_IGET 0x1 /* Go through the buffer cache */ 46#define BULKSTAT_FG_IGET 0x1 /* Go through the buffer cache */
47#define BULKSTAT_FG_QUICK 0x2 /* No iget, walk the dinode cluster */ 47#define BULKSTAT_FG_QUICK 0x2 /* No iget, walk the dinode cluster */
48#define BULKSTAT_FG_VFSLOCKED 0x4 /* Already have vfs lock */
49 48
50/* 49/*
51 * Return stat information in bulk (by-inode) for the filesystem. 50 * Return stat information in bulk (by-inode) for the filesystem.