libxfs: remove xfs_inode_log_item ili_flags

ili_flags is only set to zero and asserted to be zero; it serves
no purpose, so remove it.

(it was renamed to ili_lock_flags in the kernel in commit 898621d5,
for some reason userspace had both, with ili_flags ~unused)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_trans.h b/include/xfs_trans.h
index e6bb74c481ca915bc98f2f6c7fb7e2222eb3f982..832bde104b100ecce4e2ce6d2d5ed0f3f2aace3f 100644 (file)
--- a/include/xfs_trans.h
+++ b/include/xfs_trans.h
@@ -29,7 +29,6 @@ typedef struct xfs_log_item {
 typedef struct xfs_inode_log_item {
        xfs_log_item_t          ili_item;               /* common portion */
        struct xfs_inode        *ili_inode;             /* inode pointer */
-       unsigned short          ili_flags;              /* misc flags */
        unsigned short          ili_lock_flags;         /* lock flags */
        unsigned int            ili_fields;             /* fields to be logged */
        unsigned int            ili_last_fields;        /* fields when flushed*/

diff --git a/libxfs/trans.c b/libxfs/trans.c
index 101019b0c4354f84954b9e8626000e4fb418f2f0..64131b2989a65a23a98f0774f0033c210f039dd8 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -347,7 +347,6 @@ libxfs_trans_ijoin(
        if (ip->i_itemp == NULL)
                xfs_inode_item_init(ip, ip->i_mount);
        iip = ip->i_itemp;
-       ASSERT(iip->ili_flags == 0);
        ASSERT(iip->ili_inode != NULL);
 
        ASSERT(iip->ili_lock_flags == 0);
@@ -812,10 +811,8 @@ inode_item_done(
        mp = iip->ili_item.li_mountp;
        ASSERT(ip != NULL);
 
-       if (!(iip->ili_fields & XFS_ILOG_ALL)) {
-               iip->ili_flags = 0;     /* reset all flags */
+       if (!(iip->ili_fields & XFS_ILOG_ALL))
                goto free;
-       }
 
        /*
         * Get the buffer containing the on-disk inode.
@@ -921,7 +918,6 @@ static void
 inode_item_unlock(
        xfs_inode_log_item_t    *iip)
 {
-       iip->ili_flags = 0;
        xfs_inode_item_put(iip);
 }