Lachlan McIlroy wrote:
> Please pull from the for-linus branch:
> git pull git://oss.sgi.com:8090/xfs/xfs-2.6.git for-linus
Wondering if you guys might consider this for 2.6.24.x stable as well...
-Eric
> This will update the following files:
>
> fs/xfs/linux-2.6/xfs_ioctl.c | 2 +-
> fs/xfs/quota/xfs_qm.c | 6 +-
> fs/xfs/quota/xfs_qm_bhv.c | 2 +-
> fs/xfs/quota/xfs_qm_syscalls.c | 4 +-
> fs/xfs/xfs_attr_leaf.c | 6 +-
> fs/xfs/xfs_bmap.c | 18 +++---
> fs/xfs/xfs_bmap_btree.h | 2 +-
> fs/xfs/xfs_dir2.c | 2 +-
> fs/xfs/xfs_fsops.c | 24 +++++-----
> fs/xfs/xfs_ialloc.c | 6 +-
> fs/xfs/xfs_inode.c | 6 +-
> fs/xfs/xfs_inode_item.c | 4 +-
> fs/xfs/xfs_itable.c | 2 +-
> fs/xfs/xfs_log.c | 14 +++---
> fs/xfs/xfs_log_priv.h | 4 +-
> fs/xfs/xfs_log_recover.c | 16 +++---
> fs/xfs/xfs_mount.c | 59 +++++++++++++++++-----
> fs/xfs/xfs_sb.h | 107 ++++++++++++++-------------------------
> fs/xfs/xfs_utils.c | 6 +-
> fs/xfs/xfs_vfsops.c | 9 ++--
> fs/xfs/xfs_vnodeops.c | 2 +-
> 21 files changed, 153 insertions(+), 148 deletions(-)
>
> through these commits:
>
> commit e6957ea48429aeda4f5d51af4238231d44b0dc4a
> Author: Eric Sandeen <sandeen@xxxxxxxxxxx>
> Date: Thu Apr 10 12:19:34 2008 +1000
>
> [XFS] Ensure "both" features2 slots are consistent
>
> Since older kernels may look in the sb_bad_features2 slot for flags,
> rather than zeroing it out on fixup, we should make it equal to the
> sb_features2 value.
>
> Also, if the ATTR2 flag was not found prior to features2 fixup, it was not
> set in the mount flags, so re-check after the fixup so that the current
> session will use the feature.
>
> Also fix up the comments to reflect these changes.
>
> SGI-PV: 980085
> SGI-Modid: xfs-linux-melb:xfs-kern:30778a
>
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
> Signed-off-by: David Chinner <dgc@xxxxxxx>
> Signed-off-by: Lachlan McIlroy <lachlan@xxxxxxx>
>
> commit ee1c090825bf2f1cb9712489c234eabf69a9a78f
> Author: David Chinner <dgc@xxxxxxx>
> Date: Thu Mar 6 13:45:50 2008 +1100
>
> [XFS] Fix superblock features2 field alignment problem
>
> Due to the xfs_dsb_t structure not being 64 bit aligned, the last field of
> the on-disk superblock can vary in location This causes problems when the
> filesystem gets moved to a different platform, or there is a 32 bit
> userspace and 64 bit kernel.
>
> This patch detects the defect at mount time, logs a warning such as:
>
> XFS: correcting sb_features alignment problem
>
> in dmesg and corrects the problem so that everything is OK. it also
> blacklists the bad field in the superblock so it does not get used for
> something else later on.
>
> SGI-PV: 977636
> SGI-Modid: xfs-linux-melb:xfs-kern:30539a
>
> Signed-off-by: David Chinner <dgc@xxxxxxx>
> Signed-off-by: Christoph Hellwig <hch@xxxxxxxxxxxxx>
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
> Signed-off-by: Lachlan McIlroy <lachlan@xxxxxxx>
>
> commit 6211870992502efdccf9cd6bae155c83277835fa
> Author: Eric Sandeen <sandeen@xxxxxxxxxxx>
> Date: Thu Mar 6 13:44:28 2008 +1100
>
> [XFS] remove shouting-indirection macros from xfs_sb.h
>
> Remove macro-to-small-function indirection from xfs_sb.h, and remove some
> which are completely unused.
>
> SGI-PV: 976035
> SGI-Modid: xfs-linux-melb:xfs-kern:30528a
>
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
> Signed-off-by: Donald Douwsma <donaldd@xxxxxxx>
> Signed-off-by: Lachlan McIlroy <lachlan@xxxxxxx>
>
>
|