From: Christoph Hellwig <hch@infradead.org>
To: xfs@oss.sgi.com
Subject: [PATCH 5/6] kill the XFS_IMAP_BULKSTAT flag
Date: Mon, 27 Oct 2008 09:41:29 -0400 [thread overview]
Message-ID: <20081027134129.GF3183@infradead.org> (raw)
[-- Attachment #1: xfs-kill-XFS_IMAP_BULKSTAT --]
[-- Type: text/plain, Size: 3110 bytes --]
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>
Index: linux-2.6-xfs/fs/xfs/xfs_ialloc.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_ialloc.c 2008-10-25 13:30:56.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_ialloc.c 2008-10-25 13:33:21.000000000 +0200
@@ -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,
Index: linux-2.6-xfs/fs/xfs/xfs_iget.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_iget.c 2008-10-25 13:15:42.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_iget.c 2008-10-25 13:40:06.000000000 +0200
@@ -147,8 +147,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;
Index: linux-2.6-xfs/fs/xfs/xfs_inode.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_inode.c 2008-10-25 13:30:56.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_inode.c 2008-10-25 13:40:06.000000000 +0200
@@ -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);
}
Index: linux-2.6-xfs/fs/xfs/xfs_inode.h
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_inode.h 2008-10-25 13:30:56.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_inode.h 2008-10-25 13:40:06.000000000 +0200
@@ -167,11 +167,6 @@ typedef struct xfs_icdinode {
#define XFS_IFEXTIREC 0x08 /* Indirection array of extent blocks */
/*
- * Flags for xfs_inotobp and xfs_imap().
- */
-#define XFS_IMAP_BULKSTAT 0x1
-
-/*
* Fork handling.
*/
Index: linux-2.6-xfs/fs/xfs/xfs_itable.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_itable.c 2008-10-25 13:30:56.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_itable.c 2008-10-25 13:33:21.000000000 +0200
@@ -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;
--
next reply other threads:[~2008-10-27 13:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-27 13:41 Christoph Hellwig [this message]
2008-11-03 1:28 ` [PATCH 5/6] kill the XFS_IMAP_BULKSTAT flag Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081027134129.GF3183@infradead.org \
--to=hch@infradead.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.