[Top] [All Lists]

[PATCH] xfs: drop duplicate function resulting from merge

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs: drop duplicate function resulting from merge
From: Alex Elder <aelder@xxxxxxx>
Date: Mon, 18 Oct 2010 11:41:18 -0500
User-agent: Heirloom mailx 12.4 7/29/08
The XFS development master branch somehow diverged from Linus'
master branch in such a way that merging the former into the latter
caused __xfs_inode_clear_reclaim_tag() to appear twice in the file

I'm resolving this by re-basing the XFS branch against linus/master.
This commit (on top of that rebase) deletes the extra copy of the

Signed-off-by: Alex Elder <aelder@xxxxxxx>
 fs/xfs/linux-2.6/xfs_sync.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
index 574fb71..37d3325 100644
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
@@ -667,17 +667,6 @@ xfs_reclaim_inode_grab(
        return 0;
-       xfs_mount_t     *mp,
-       xfs_perag_t     *pag,
-       xfs_inode_t     *ip)
-       radix_tree_tag_clear(&pag->pag_ici_root,
-                       XFS_INO_TO_AGINO(mp, ip->i_ino), XFS_ICI_RECLAIM_TAG);
-       __xfs_inode_clear_reclaim(pag, ip);
  * Inodes in different states need to be treated differently, and the return
  * value of xfs_iflush is not sufficient to get this right. The following table

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] xfs: drop duplicate function resulting from merge, Alex Elder <=