From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Cc: Dave Chinner <david@fromorbit.com>
Subject: [PATCH 2/3] XFS: kill shouty XFS_ITOV_NULL macro
Date: Sun, 20 Jul 2008 22:43:47 +1000 [thread overview]
Message-ID: <1216557828-29056-3-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1216557828-29056-1-git-send-email-david@fromorbit.com>
Replace XFS_ITOV_NULL() with the new VFS_I() inline.
Signed-off-by: Dave Chinner <david@fromorbit.com>
---
fs/xfs/linux-2.6/xfs_vnode.c | 2 +-
fs/xfs/quota/xfs_qm_syscalls.c | 2 +-
fs/xfs/xfs_inode.h | 1 -
fs/xfs/xfs_vfsops.c | 2 +-
fs/xfs/xfs_vnodeops.c | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c
index bc7afe0..ffd6003 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.c
+++ b/fs/xfs/linux-2.6/xfs_vnode.c
@@ -158,7 +158,7 @@ vn_hold(
*/
static inline int xfs_icount(struct xfs_inode *ip)
{
- bhv_vnode_t *vp = XFS_ITOV_NULL(ip);
+ bhv_vnode_t *vp = VFS_I(ip);
if (vp)
return vn_count(vp);
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c
index c43b6d4..8407f32 100644
--- a/fs/xfs/quota/xfs_qm_syscalls.c
+++ b/fs/xfs/quota/xfs_qm_syscalls.c
@@ -1054,7 +1054,7 @@ xfs_qm_dqrele_inodes_ag(
first_index = XFS_INO_TO_AGINO(mp, ip->i_ino + 1);
/* Root inode, rbmip and rsumip have associated blocks */
- vp = XFS_ITOV_NULL(ip);
+ vp = VFS_I(ip);
if (!vp || ip == XFS_QI_UQIP(mp) || ip == XFS_QI_GQIP(mp)) {
ASSERT(ip->i_udquot == NULL);
ASSERT(ip->i_gdquot == NULL);
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 7726d41..4d966a4 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -272,7 +272,6 @@ static inline struct inode *VFS_I(struct xfs_inode *ip)
return vn_to_inode(ip->i_vnode);
}
#define XFS_ITOV(ip) VFS_I(ip)
-#define XFS_ITOV_NULL(ip) VFS_I(ip)
/*
* i_flags helper functions
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 0ff9812..a184e36 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -325,7 +325,7 @@ xfs_sync_inodes_ag(
* skip inodes in reclaim. Let xfs_syncsub do that for
* us so we don't need to worry.
*/
- vp = XFS_ITOV_NULL(ip);
+ vp = VFS_I(ip);
if (!vp) {
read_unlock(&pag->pag_ici_lock);
continue;
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 2af1be3..5d1b254 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -2924,7 +2924,7 @@ xfs_finish_reclaim(
int sync_mode)
{
xfs_perag_t *pag = xfs_get_perag(ip->i_mount, ip->i_ino);
- bhv_vnode_t *vp = XFS_ITOV_NULL(ip);
+ bhv_vnode_t *vp = VFS_I(ip);
if (vp && VN_BAD(vp))
goto reclaim;
--
1.5.6
next prev parent reply other threads:[~2008-07-20 12:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-20 12:43 [PATCH 0/3] XFS: sanitise VFS inode extraction Dave Chinner
2008-07-20 12:43 ` [PATCH 1/3] XFS: Avoid directly referencing the VFS inode Dave Chinner
2008-07-20 12:43 ` Dave Chinner [this message]
2008-07-20 12:43 ` [PATCH 3/3] XFS: Kill shouty XFS_ITOV() macro Dave Chinner
2008-07-21 8:01 ` [PATCH 0/3] XFS: sanitise VFS inode extraction Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2008-07-21 11:46 [PATCH 0/3] XFS: sanitise VFS inode extraction V2 Dave Chinner
2008-07-21 11:46 ` [PATCH 2/3] XFS: kill shouty XFS_ITOV_NULL macro 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=1216557828-29056-3-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--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.