cnic, bnx2i: Fix bug on some bnx2x devices that don't support iSCSI

[~andy/linux] / fs / xfs / xfs_trans_inode.c

diff --git a/fs/xfs/xfs_trans_inode.c b/fs/xfs/xfs_trans_inode.c
index ac6d567704dbef8beb6c2b74bc22250a2f5da77b..53dfe46f3680791a8eab2e72c1a92db3cb17c091 100644 (file)
--- a/fs/xfs/xfs_trans_inode.c
+++ b/fs/xfs/xfs_trans_inode.c
@@ -112,6 +112,17 @@ xfs_trans_log_inode(
        ASSERT(ip->i_itemp != NULL);
        ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
 
+       /*
+        * First time we log the inode in a transaction, bump the inode change
+        * counter if it is configured for this to occur.
+        */
+       if (!(ip->i_itemp->ili_item.li_desc->lid_flags & XFS_LID_DIRTY) &&
+           IS_I_VERSION(VFS_I(ip))) {
+               inode_inc_iversion(VFS_I(ip));
+               ip->i_d.di_changecount = VFS_I(ip)->i_version;
+               flags |= XFS_ILOG_CORE;
+       }
+
        tp->t_flags |= XFS_TRANS_DIRTY;
        ip->i_itemp->ili_item.li_desc->lid_flags |= XFS_LID_DIRTY;