Merge branch 'xfs-misc-fixes-4.6-2' into for-next (3c1a79f5) · Commits · e / devices / android_kernel_fairphone_FP5

fs/xfs/libxfs/xfs_bmap.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -5210,7 +5210,7 @@ xfs_bunmapi(
		* This is better than zeroing it.
		*/
		ASSERT(del.br_state == XFS_EXT_NORM);
		ASSERT(xfs_trans_get_block_res(tp) > 0);
		ASSERT(tp->t_blk_res > 0);
		/*
		* If this spans a realtime extent boundary,
		* chop it back to the start of the one we end at.
		@@ -5241,7 +5241,7 @@ xfs_bunmapi(
		del.br_startblock += mod;
		} else if ((del.br_startoff == start &&
		(del.br_state == XFS_EXT_UNWRITTEN \|\|
		xfs_trans_get_block_res(tp) == 0)) \|\|
		tp->t_blk_res == 0)) \|\|
		!xfs_sb_version_hasextflgbit(&mp->m_sb)) {
		/*
		* Can't make it unwritten. There isn't
		@@ -5332,7 +5332,7 @@ xfs_bunmapi(
		* conversion to btree format, since the transaction
		* will be dirty.
		*/
		if (!wasdel && xfs_trans_get_block_res(tp) == 0 &&
		if (!wasdel && tp->t_blk_res == 0 &&
		XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_EXTENTS &&
		XFS_IFORK_NEXTENTS(ip, whichfork) >= /* Note the >= */
		XFS_IFORK_MAXEXT(ip, whichfork) &&

+2 −2

Original line number	Diff line number	Diff line
		@@ -461,7 +461,7 @@ xfs_bmbt_alloc_block(
		* reservation amount is insufficient then we may fail a
		* block allocation here and corrupt the filesystem.
		*/
		args.minleft = xfs_trans_get_block_res(args.tp);
		args.minleft = args.tp->t_blk_res;
		} else if (cur->bc_private.b.flist->xbf_low) {
		args.type = XFS_ALLOCTYPE_START_BNO;
		} else {
		@@ -470,7 +470,7 @@ xfs_bmbt_alloc_block(

		args.minlen = args.maxlen = args.prod = 1;
		args.wasdel = cur->bc_private.b.flags & XFS_BTCUR_BPRV_WASDEL;
		if (!args.wasdel && xfs_trans_get_block_res(args.tp) == 0) {
		if (!args.wasdel && args.tp->t_blk_res == 0) {
		error = -ENOSPC;
		goto error0;
		}

+10 −9

Original line number	Diff line number	Diff line
		@@ -202,8 +202,10 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
		sbp->namelen,
		sbp->valuelen,
		&sbp->name[sbp->namelen]);
		if (error)
		if (error) {
		kmem_free(sbuf);
		return error;
		}
		if (context->seen_enough)
		break;
		cursor->offset++;
		@@ -454,8 +456,7 @@ xfs_attr3_leaf_list_int(
		args.rmtblkcnt = xfs_attr3_rmt_blocks(
		args.dp->i_mount, valuelen);
		retval = xfs_attr_rmtval_get(&args);
		if (retval)
		return retval;
		if (!retval)
		retval = context->put_listent(context,
		entry->flags,
		name_rmt->name,

+1 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ xfs_discard_extents(
		GFP_NOFS, 0);
		if (error && error != -EOPNOTSUPP) {
		xfs_info(mp,
		"discard failed for extent [0x%llu,%u], error %d",
		"discard failed for extent [0x%llx,%u], error %d",
		(unsigned long long)busyp->bno,
		busyp->length,
		error);

+1 −19

Original line number	Diff line number	Diff line
		@@ -185,9 +185,6 @@ xfs_initialize_perag(
		xfs_agnumber_t index;
		xfs_agnumber_t first_initialised = 0;
		xfs_perag_t *pag;
		xfs_agino_t agino;
		xfs_ino_t ino;
		xfs_sb_t *sbp = &mp->m_sb;
		int error = -ENOMEM;

		/*
		@@ -230,22 +227,7 @@ xfs_initialize_perag(
		radix_tree_preload_end();
		}

		/*
		* If we mount with the inode64 option, or no inode overflows
		* the legacy 32-bit address space clear the inode32 option.
		*/
		agino = XFS_OFFBNO_TO_AGINO(mp, sbp->sb_agblocks - 1, 0);
		ino = XFS_AGINO_TO_INO(mp, agcount - 1, agino);

		if ((mp->m_flags & XFS_MOUNT_SMALL_INUMS) && ino > XFS_MAXINUMBER_32)
		mp->m_flags \|= XFS_MOUNT_32BITINODES;
		else
		mp->m_flags &= ~XFS_MOUNT_32BITINODES;

		if (mp->m_flags & XFS_MOUNT_32BITINODES)
		index = xfs_set_inode32(mp, agcount);
		else
		index = xfs_set_inode64(mp, agcount);
		index = xfs_set_inode_alloc(mp, agcount);

		if (maxagi)
		*maxagi = index;