[GIT PULL] XFS update for 2.6.24-rc1

Tim Shimmin
2007-10-19T08:30:34Z

Hi Linus,

A couple of Christoph patches for XFS ...
A fid one for nfs exports which akpm is waiting for.
Thanks.

Please pull from the for-linus branch:
git pull git://oss.sgi.com:8090/xfs/xfs-2.6.git for-linus

This will update the following files:

fs/xfs/linux-2.6/xfs_export.c | 6 +++---
fs/xfs/linux-2.6/xfs_export.h | 6 +++---
fs/xfs/linux-2.6/xfs_ioctl.c | 24 ++++++++++++------------
fs/xfs/xfs_dmops.c | 21 ++++-----------------
fs/xfs/xfs_fs.h | 29 ++++++-----------------------
fs/xfs/xfs_qmops.c | 22 +++++++---------------
fs/xfs/xfs_vfsops.c | 9 ++++-----
fs/xfs/xfs_vfsops.h | 4 ++--
fs/xfs/xfs_vnodeops.c | 13 ++-----------
fs/xfs/xfs_vnodeops.h | 2 +-
10 files changed, 44 insertions(+), 92 deletions(-)

through these commits:

commit c6143911a7e0f8abef0319c801eb36718f57dfde
Author: Christoph Hellwig <hch@infradead.org>
Date: Fri Sep 14 15:22:37 2007 +1000

[XFS] cleanup fid types mess

Currently XFs has three different fid types: struct fid, struct xfs_fid
and struct xfs_fid2 with hte latter two beeing identicaly and the first
one beeing the same size but an unstructured array with the same size.

This patch consolidates all this to alway uuse struct xfs_fid.

This patch is required for an upcoming patch series from me that revamps
the nfs exporting code and introduces a Linux-wide struct fid.

SGI-PV: 970336
SGI-Modid: xfs-linux-melb:xfs-kern:29651a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

commit c8fcfac5a257f8a04f7ba3d397dedccffef19be2
Author: Christoph Hellwig <hch@lst.de>
Date: Fri Oct 19 16:57:01 2007 +1000

[XFS] fixups after behavior removal merge into mainline git

Fixup for lack of dmapi support and no quota module support.

SGI-PV: 969985

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Tim Shimmin <tes@sgi.com>