Hi Linus,
I'll try again :)
(Got the makefile changes this time and fixed up the diffstat below hopefully)
Please pull from:
git://oss.sgi.com:8090/xfs/xfs-2.6
It contains some bug fixes (notably inode iunpin fix),
a couple of patches Andrew Morton was carrying and
a few other fixups/support.
This will update the following files:
fs/xfs/Makefile-linux-2.6 | 17 +---------
fs/xfs/linux-2.6/xfs_buf.c | 4 +-
fs/xfs/linux-2.6/xfs_dmapi_priv.h | 28 ++++++++++++++++
fs/xfs/linux-2.6/xfs_ioctl.c | 5 ++-
fs/xfs/linux-2.6/xfs_super.c | 4 +-
fs/xfs/support/debug.c | 4 +-
fs/xfs/support/move.c | 2 +
fs/xfs/support/move.h | 2 +
fs/xfs/xfs.h | 23 +++++++++++++
fs/xfs/xfs_dir2.c | 2 +
fs/xfs/xfs_dmapi.h | 22 +------------
fs/xfs/xfs_iget.c | 51 +++++++++++++++++++++--------
fs/xfs/xfs_inode.c | 64 ++++++++++++++++---------------------
fs/xfs/xfs_inode.h | 41 ++++++++++++++++++++++++
fs/xfs/xfs_vnodeops.c | 33 +++++++++++--------
15 files changed, 189 insertions(+), 113 deletions(-)
through these commits:
commit 93c189c1148a5e39bcc8f62568f42a77f93477c5
Author: Vlad Apostolov <vapo@xxxxxxx>
Date: Sat Nov 11 18:03:49 2006 +1100
[XFS] 956618: Linux crashes on boot with XFS-DMAPI filesystem when
CONFIG_XFS_TRACE is on
SGI-PV: 956618
SGI-Modid: xfs-linux-melb:xfs-kern:27196a
Signed-off-by: Vlad Apostolov <vapo@xxxxxxx>
Signed-off-by: Tim Shimmin <tes@xxxxxxx>
commit 439b8434792d0b62e32ab1416f214a18a640cc03
Author: Tim Shimmin <tes@xxxxxxx>
Date: Sat Nov 11 18:04:34 2006 +1100
[XFS] Keep lockdep happy.
SGI-PV: 956964
SGI-Modid: xfs-linux-melb:xfs-kern:27200a
Signed-off-by: Tim Shimmin <tes@xxxxxxx>
Signed-off-by: David Chinner <dgc@xxxxxxx>
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
commit 70a505285f9859f77e07f7c12371b0d29ecf3d82
Author: Vlad Apostolov <vapo@xxxxxxx>
Date: Sat Nov 11 18:04:41 2006 +1100
[XFS] rename uio_read() to xfs_uio_read()
SGI-PV: 957004
SGI-Modid: xfs-linux-melb:xfs-kern:27231a
Signed-off-by: Vlad Apostolov <vapo@xxxxxxx>
Signed-off-by: Tim Shimmin <tes@xxxxxxx>
commit 2e2e7bb1fd857b9fc83b0cd77b6b647ebb423301
Author: Vlad Apostolov <vapo@xxxxxxx>
Date: Sat Nov 11 18:04:47 2006 +1100
[XFS] 956664: dm_read_invis() changes i_atime
SGI-PV: 956664
SGI-Modid: xfs-linux-melb:xfs-kern:27315a
Signed-off-by: Vlad Apostolov <vapo@xxxxxxx>
Signed-off-by: Sam Vaughan <sjv@xxxxxxx>
Signed-off-by: Tim Shimmin <tes@xxxxxxx>
commit 7a18c386078eaf17ae54595f66c0d64d9c1cb29c
Author: David Chinner <dgc@xxxxxxx>
Date: Sat Nov 11 18:04:54 2006 +1100
[XFS] Clean up i_flags and i_flags_lock handling.
SGI-PV: 956832
SGI-Modid: xfs-linux-melb:xfs-kern:27358a
Signed-off-by: David Chinner <dgc@xxxxxxx>
Signed-off-by: Nathan Scott <nscott@xxxxxxxxxx>
Signed-off-by: Tim Shimmin <tes@xxxxxxx>
commit 4c60658e0f4e253cf275f12b7c76bf128515a774
Author: David Chinner <dgc@xxxxxxx>
Date: Sat Nov 11 18:05:00 2006 +1100
[XFS] Prevent a deadlock when xfslogd unpins inodes.
The previous fixes for the use after free in xfs_iunpin left a nasty log
deadlock when xfslogd unpinned the inode and dropped the last reference to
the inode. the ->clear_inode() method can issue transactions, and if the
log was full, the transaction could push on the log and get stuck trying
to push the inode it was currently unpinning.
To fix this, we provide xfs_iunpin a guarantee that it will always have a
valid xfs_inode <-> linux inode link or a particular flag will be set on
the inode. We then use log forces during lookup to ensure transactions are
completed before we recycle the inode. This ensures that xfs_iunpin will
never use the linux inode after it is being freed, and any lookup on an
inode on the reclaim list will wait until it is safe to attach a new linux
inode to the xfs inode.
SGI-PV: 956832
SGI-Modid: xfs-linux-melb:xfs-kern:27359a
Signed-off-by: David Chinner <dgc@xxxxxxx>
Signed-off-by: Shailendra Tripathi <stripathi@xxxxxxxxx>
Signed-off-by: Takenori Nagano <t-nagano@xxxxxxxxxxxxx>
Signed-off-by: Tim Shimmin <tes@xxxxxxx>
commit 050e714eb2bc662e9df6bf048ce86b4fbdd9bcd3
Author: David Chinner <dgc@xxxxxxx>
Date: Sat Nov 11 18:05:06 2006 +1100
[XFS] Remove KERNEL_VERSION macros from xfs_dmapi.h
SGI-PV: 957005
SGI-Modid: xfs-linux-melb:xfs-kern:27398a
Signed-off-by: David Chinner <dgc@xxxxxxx>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx>
Signed-off-by: Tim Shimmin <tes@xxxxxxx>
--Tim
|