[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>

[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>
Nathan Scott
1 parent ad723875ac
Showing 3 changed files with 1 additions and 20 deletions Side-by-side Diff
fs/xfs/quota/xfs_qm.c
fs/xfs/xfs_itable.c
fs/xfs/xfs_itable.h
@@ -1905,9 +1905,7 @@
 		 */
 		if ((error = xfs_bulkstat(mp, &lastino, &count,
 				     xfs_qm_dqusage_adjust, NULL,
-				     structsz, NULL,
-				     BULKSTAT_FG_IGET|BULKSTAT_FG_VFSLOCKED,
-				     &done)))
+				     structsz, NULL, BULKSTAT_FG_IGET, &done)))
 			break;
  
 	} while (! done);
@@ -41,11 +41,6 @@
 #include "xfs_error.h"
 #include "xfs_btree.h"
  
-#ifndef HAVE_USERACC
-#define useracc(ubuffer, size, flags, foo) (0)
-#define unuseracc(ubuffer, size, flags)
-#endif
-
 STATIC int
 xfs_bulkstat_one_iget(
 	xfs_mount_t	*mp,		/* mount point for filesystem */
@@ -336,15 +331,6 @@
 	nimask = ~(nicluster - 1);
 	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.
 	 * We could try allocating something smaller, but for normal
 	 * calls we'll always (potentially) need the whole page.
@@ -650,8 +636,6 @@
 	 * Done, we're either out of filesystem or space to put the data.
 	 */
 	kmem_free(irbuf, NBPC);
-	if (ubuffer)
-		unuseracc(ubuffer, ubcount * statstruct_size, (B_READ|B_PHYS));
 	*ubcountp = ubelem;
 	if (agno >= mp->m_sb.sb_agcount) {
 		/*
@@ -45,7 +45,6 @@
  */
 #define	BULKSTAT_FG_IGET	0x1	/* Go through the buffer cache */
 #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.
...	...	@@ -1905,9 +1905,7 @@
1905	1905	*/
1906	1906	if ((error = xfs_bulkstat(mp, &lastino, &count,
1907	1907	xfs_qm_dqusage_adjust, NULL,
1908		- structsz, NULL,
1909		- BULKSTAT_FG_IGET\|BULKSTAT_FG_VFSLOCKED,
1910		- &done)))
	1908	+ structsz, NULL, BULKSTAT_FG_IGET, &done)))
1911	1909	break;
1912	1910
1913	1911	} while (! done);
...	...	@@ -41,11 +41,6 @@
41	41	#include "xfs_error.h"
42	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		-
49	44	STATIC int
50	45	xfs_bulkstat_one_iget(
51	46	xfs_mount_t mp, / mount point for filesystem */
...	...	@@ -336,15 +331,6 @@
336	331	nimask = ~(nicluster - 1);
337	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	334	* Allocate a page-sized buffer for inode btree records.
349	335	* We could try allocating something smaller, but for normal
350	336	* calls we'll always (potentially) need the whole page.
...	...	@@ -650,8 +636,6 @@
650	636	* Done, we're either out of filesystem or space to put the data.
651	637	*/
652	638	kmem_free(irbuf, NBPC);
653		- if (ubuffer)
654		- unuseracc(ubuffer, ubcount * statstruct_size, (B_READ\|B_PHYS));
655	639	*ubcountp = ubelem;
656	640	if (agno >= mp->m_sb.sb_agcount) {
657	641	/*
...	...	@@ -45,7 +45,6 @@
45	45	*/
46	46	#define BULKSTAT_FG_IGET 0x1 /* Go through the buffer cache */
47	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	50	* Return stat information in bulk (by-inode) for the filesystem.