TAKE - Merge irix6.5f:irix:104607a

[Eric Sandeen <sandeen@xxxxxxx>]

Date:  Fri Oct 19 09:59:07 PDT 2001
Workarea:  stout.americas.sgi.com:/localhome/eric/2.4.x-xfs/workarea-reallyclean

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs


Modid:  2.4.x-xfs:slinx:105089a
linux/fs/xfs/xfs_trans_dquot.c - 1.33
        - Merge irix6.5f:irix:104607a
          Change an ASSERT in xfs_trans_reserve_quota_nblks() to mask out
          XFS_QMOPT_FORCE_RES.
          Fix for bug 833507.

linux/fs/xfs/xfs_bmap.c - 1.276
        - Merge irix6.5f:irix:104607a
          Don't enforce quotas when reserving blocks for root extended 
attributes.
          Fix for bug 833507.

linux/fs/xfs/xfs_quota.h - 1.25
        - Merge irix6.5f:irix:104607a
          Create new xfs_trans_reserve_blkquota_force() macro.
          Fix for bug 833507.

linux/fs/xfs/xfs_attr.c - 1.85
        - Merge irix6.5f:irix:104607a
          Don't enforce quotas when reserving blocks for root extended 
attributes.
          Fix for bug 833507.