adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[XFS] kill the XFS_IMAP_BULKSTAT flag

Browse source 
Just pass down the XFS_IGET_* flags all the way down to xfs_imap instead
of translating them mid-way.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
This commit is contained in:
Christoph Hellwig 2008-11-28 14:23:41 +11:00 committed by Niv Sardi
parent 92bfc6e7c4
commit b48d8d6437
5 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/xfs/xfs_ialloc.c
View file

@ -1228,7 +1228,7 @@ xfs_imap(
ino != XFS_AGINO_TO_INO(mp, agno, agino)) {
#ifdef DEBUG
/* no diagnostics for bulkstat, ino comes from userspace */
if (flags & XFS_IMAP_BULKSTAT)
if (flags & XFS_IGET_BULKSTAT)
return XFS_ERROR(EINVAL);
if (agno >= mp->m_sb.sb_agcount) {
xfs_fs_cmn_err(CE_ALERT, mp,

3
fs/xfs/xfs_iget.c
View file

@ -159,8 +159,7 @@ xfs_iget_cache_miss(
* Read the disk inode attributes into a new inode structure and get
* a new vnode for it. This should also initialize i_ino and i_mount.
*/
error = xfs_iread(mp, tp, ino, &ip, bno,
(flags & XFS_IGET_BULKSTAT) ? XFS_IMAP_BULKSTAT : 0);
error = xfs_iread(mp, tp, ino, &ip, bno, flags);
if (error)
return error;

4
fs/xfs/xfs_inode.c
View file

@ -136,7 +136,7 @@ xfs_imap_to_bp(
struct xfs_imap *imap,
xfs_buf_t **bpp,
uint buf_flags,
uint imap_flags)
uint iget_flags)
{
int error;
int i;
@ -178,7 +178,7 @@ xfs_imap_to_bp(
if (unlikely(XFS_TEST_ERROR(!di_ok, mp,
XFS_ERRTAG_ITOBP_INOTOBP,
XFS_RANDOM_ITOBP_INOTOBP))) {
if (imap_flags & XFS_IMAP_BULKSTAT) {
if (iget_flags & XFS_IGET_BULKSTAT) {
xfs_trans_brelse(tp, bp);
return XFS_ERROR(EINVAL);
}

5
fs/xfs/xfs_inode.h
View file

@ -166,11 +166,6 @@ typedef struct xfs_icdinode {
#define XFS_IFBROOT 0x04 /* i_broot points to the bmap b-tree root */
#define XFS_IFEXTIREC 0x08 /* Indirection array of extent blocks */
/*
* Flags for xfs_inotobp and xfs_imap().
*/
#define XFS_IMAP_BULKSTAT 0x1
/*
* Fork handling.
*/

2
fs/xfs/xfs_itable.c
View file

@ -595,7 +595,7 @@ xfs_bulkstat(
error = xfs_inotobp(mp, NULL, ino, &dip,
&bp, &offset,
XFS_IMAP_BULKSTAT);
XFS_IGET_BULKSTAT);
if (!error)
clustidx = offset / mp->m_sb.sb_inodesize;