提交 9c48876a 编写于 作者: N Nathan Scott

[XFS] Remove dead code from come bulkstat paths.

SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:26102a
Signed-off-by: NNathan Scott <nathans@sgi.com>
上级 ad723875
...@@ -1905,9 +1905,7 @@ xfs_qm_quotacheck( ...@@ -1905,9 +1905,7 @@ xfs_qm_quotacheck(
*/ */
if ((error = xfs_bulkstat(mp, &lastino, &count, if ((error = xfs_bulkstat(mp, &lastino, &count,
xfs_qm_dqusage_adjust, NULL, xfs_qm_dqusage_adjust, NULL,
structsz, NULL, structsz, NULL, BULKSTAT_FG_IGET, &done)))
BULKSTAT_FG_IGET|BULKSTAT_FG_VFSLOCKED,
&done)))
break; break;
} while (! done); } while (! done);
......
...@@ -41,11 +41,6 @@ ...@@ -41,11 +41,6 @@
#include "xfs_error.h" #include "xfs_error.h"
#include "xfs_btree.h" #include "xfs_btree.h"
#ifndef HAVE_USERACC
#define useracc(ubuffer, size, flags, foo) (0)
#define unuseracc(ubuffer, size, flags)
#endif
STATIC int STATIC int
xfs_bulkstat_one_iget( xfs_bulkstat_one_iget(
xfs_mount_t *mp, /* mount point for filesystem */ xfs_mount_t *mp, /* mount point for filesystem */
...@@ -335,15 +330,6 @@ xfs_bulkstat( ...@@ -335,15 +330,6 @@ xfs_bulkstat(
(XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog); (XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog);
nimask = ~(nicluster - 1); nimask = ~(nicluster - 1);
nbcluster = nicluster >> mp->m_sb.sb_inopblog; nbcluster = nicluster >> mp->m_sb.sb_inopblog;
/*
* Lock down the user's buffer. If a buffer was not sent, as in the case
* disk quota code calls here, we skip this.
*/
if (ubuffer &&
(error = useracc(ubuffer, ubcount * statstruct_size,
(B_READ|B_PHYS), NULL))) {
return error;
}
/* /*
* Allocate a page-sized buffer for inode btree records. * Allocate a page-sized buffer for inode btree records.
* We could try allocating something smaller, but for normal * We could try allocating something smaller, but for normal
...@@ -650,8 +636,6 @@ xfs_bulkstat( ...@@ -650,8 +636,6 @@ xfs_bulkstat(
* Done, we're either out of filesystem or space to put the data. * Done, we're either out of filesystem or space to put the data.
*/ */
kmem_free(irbuf, NBPC); kmem_free(irbuf, NBPC);
if (ubuffer)
unuseracc(ubuffer, ubcount * statstruct_size, (B_READ|B_PHYS));
*ubcountp = ubelem; *ubcountp = ubelem;
if (agno >= mp->m_sb.sb_agcount) { if (agno >= mp->m_sb.sb_agcount) {
/* /*
......
...@@ -45,7 +45,6 @@ typedef int (*bulkstat_one_pf)(struct xfs_mount *mp, ...@@ -45,7 +45,6 @@ typedef int (*bulkstat_one_pf)(struct xfs_mount *mp,
*/ */
#define BULKSTAT_FG_IGET 0x1 /* Go through the buffer cache */ #define BULKSTAT_FG_IGET 0x1 /* Go through the buffer cache */
#define BULKSTAT_FG_QUICK 0x2 /* No iget, walk the dinode cluster */ #define BULKSTAT_FG_QUICK 0x2 /* No iget, walk the dinode cluster */
#define BULKSTAT_FG_VFSLOCKED 0x4 /* Already have vfs lock */
/* /*
* Return stat information in bulk (by-inode) for the filesystem. * Return stat information in bulk (by-inode) for the filesystem.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册