Commit 5d69a029 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Ensure "both" features2 slots are consistent
  [XFS] Fix superblock features2 field alignment problem
  [XFS] remove shouting-indirection macros from xfs_sb.h
parents 999646e3 e6957ea4

fs/xfs/linux-2.6/xfs_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ xfs_ioctl( 
		 * Only allow the sys admin to reserve space unless

		 * unwritten extents are enabled.

		 */

		if (!XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb) &&

		if (!xfs_sb_version_hasextflgbit(&mp->m_sb) &&

		    !capable(CAP_SYS_ADMIN))

			return -EPERM;

fs/xfs/quota/xfs_qm.c

+3 −3
Original line number Diff line number Diff line
@@ -1405,13 +1405,13 @@ xfs_qm_qino_alloc( 
#if defined(DEBUG) && defined(XFS_LOUD_RECOVERY)

		unsigned oldv = mp->m_sb.sb_versionnum;

#endif

		ASSERT(!XFS_SB_VERSION_HASQUOTA(&mp->m_sb));

		ASSERT(!xfs_sb_version_hasquota(&mp->m_sb));

		ASSERT((sbfields & (XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO |

				   XFS_SB_GQUOTINO | XFS_SB_QFLAGS)) ==

		       (XFS_SB_VERSIONNUM | XFS_SB_UQUOTINO |

			XFS_SB_GQUOTINO | XFS_SB_QFLAGS));



		XFS_SB_VERSION_ADDQUOTA(&mp->m_sb);

		xfs_sb_version_addquota(&mp->m_sb);

		mp->m_sb.sb_uquotino = NULLFSINO;

		mp->m_sb.sb_gquotino = NULLFSINO;
@@ -1954,7 +1954,7 @@ xfs_qm_init_quotainos( 
	/*

	 * Get the uquota and gquota inodes

	 */

	if (XFS_SB_VERSION_HASQUOTA(&mp->m_sb)) {

	if (xfs_sb_version_hasquota(&mp->m_sb)) {

		if (XFS_IS_UQUOTA_ON(mp) &&

		    mp->m_sb.sb_uquotino != NULLFSINO) {

			ASSERT(mp->m_sb.sb_uquotino > 0);

fs/xfs/quota/xfs_qm_bhv.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ xfs_qm_newmount( 
	*quotaflags = 0;

	*needquotamount = B_FALSE;



	quotaondisk = XFS_SB_VERSION_HASQUOTA(&mp->m_sb) &&

	quotaondisk = xfs_sb_version_hasquota(&mp->m_sb) &&

				(mp->m_sb.sb_qflags & XFS_ALL_QUOTA_ACCT);



	if (quotaondisk) {

fs/xfs/quota/xfs_qm_syscalls.c

+2 −2
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ xfs_qm_scall_trunc_qfiles( 
	if (!capable(CAP_SYS_ADMIN))

		return XFS_ERROR(EPERM);

	error = 0;

	if (!XFS_SB_VERSION_HASQUOTA(&mp->m_sb) || flags == 0) {

	if (!xfs_sb_version_hasquota(&mp->m_sb) || flags == 0) {

		qdprintk("qtrunc flags=%x m_qflags=%x\n", flags, mp->m_qflags);

		return XFS_ERROR(EINVAL);

	}
@@ -522,7 +522,7 @@ xfs_qm_scall_getqstat( 
	memset(out, 0, sizeof(fs_quota_stat_t));



	out->qs_version = FS_QSTAT_VERSION;

	if (! XFS_SB_VERSION_HASQUOTA(&mp->m_sb)) {

	if (!xfs_sb_version_hasquota(&mp->m_sb)) {

		out->qs_uquota.qfs_ino = NULLFSINO;

		out->qs_gquota.qfs_ino = NULLFSINO;

		return (0);

fs/xfs/xfs_attr_leaf.c

+3 −3
Original line number Diff line number Diff line
@@ -227,10 +227,10 @@ STATIC void 
xfs_sbversion_add_attr2(xfs_mount_t *mp, xfs_trans_t *tp)

{

	if ((mp->m_flags & XFS_MOUNT_ATTR2) &&

	    !(XFS_SB_VERSION_HASATTR2(&mp->m_sb))) {

	    !(xfs_sb_version_hasattr2(&mp->m_sb))) {

		spin_lock(&mp->m_sb_lock);

		if (!XFS_SB_VERSION_HASATTR2(&mp->m_sb)) {

			XFS_SB_VERSION_ADDATTR2(&mp->m_sb);

		if (!xfs_sb_version_hasattr2(&mp->m_sb)) {

			xfs_sb_version_addattr2(&mp->m_sb);

			spin_unlock(&mp->m_sb_lock);

			xfs_mod_sb(tp, XFS_SB_VERSIONNUM | XFS_SB_FEATURES2);

		} else