[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1429724021-7675-1-git-send-email-Waiman.Long@hp.com>
Date: Wed, 22 Apr 2015 13:33:41 -0400
From: Waiman Long <Waiman.Long@...com>
To: Dave Chinner <david@...morbit.com>, xfs@....sgi.com
Cc: linux-kernel@...r.kernel.org, Waiman Long <Waiman.Long@...com>
Subject: [PATCH] xfs: call xfs_idestroy_fork() in xfs_ilock() critical section
The commit f7be2d7f594cbc ("xfs: push down inactive transaction
mgmt for truncate") refactored the xfs_inactive() function
in fs/xfs/xfs_inode.c. However, it also moved the call to
xfs_idestroy_fork() from inside the xfs_ilock() critical section to
outside. That was causing memory corruption and strange failures like
deferencing NULL pointers in some circumstances.
This patch moves the xfs_idestroy_fork() call back into an xfs_ilock()
critical section to avoid memory corruption problem.
Signed-off-by: Waiman Long <Waiman.Long@...com>
---
fs/xfs/xfs_inode.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 6163767..31850fb 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1900,8 +1900,11 @@ xfs_inactive(
return;
}
- if (ip->i_afp)
+ if (ip->i_afp) {
+ xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_idestroy_fork(ip, XFS_ATTR_FORK);
+ xfs_iunlock(ip, XFS_ILOCK_EXCL);
+ }
ASSERT(ip->i_d.di_anextents == 0);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists