Merge branch 'xfs-misc-fixes-4.6' into for-next (6d247d47) · Commits · 戴 / test

fs/xfs/libxfs/xfs_alloc_btree.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -118,8 +118,6 @@ xfs_allocbt_free_block(
		xfs_extent_busy_insert(cur->bc_tp, be32_to_cpu(agf->agf_seqno), bno, 1,
		XFS_EXTENT_BUSY_SKIP_DISCARD);
		xfs_trans_agbtree_delta(cur->bc_tp, -1);

		xfs_trans_binval(cur->bc_tp, bp);
		return 0;
		}

fs/xfs/libxfs/xfs_attr_sf.h

+0 −16

Original line number	Diff line number	Diff line
		@@ -24,22 +24,6 @@
		* Small attribute lists are packed as tightly as possible so as
		* to fit into the literal area of the inode.
		*/

		/*
		* Entries are packed toward the top as tight as possible.
		*/
		typedef struct xfs_attr_shortform {
		struct xfs_attr_sf_hdr { /* constant-structure header block */
		__be16 totsize; /* total bytes in shortform list */
		__u8 count; /* count of active entries */
		} hdr;
		struct xfs_attr_sf_entry {
		__uint8_t namelen; /* actual length of name (no NULL) */
		__uint8_t valuelen; /* actual length of value (no NULL) */
		__uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */
		__uint8_t nameval[1]; /* name & value bytes concatenated */
		} list[1]; /* variable sized array */
		} xfs_attr_shortform_t;
		typedef struct xfs_attr_sf_hdr xfs_attr_sf_hdr_t;
		typedef struct xfs_attr_sf_entry xfs_attr_sf_entry_t;

fs/xfs/libxfs/xfs_bmap_btree.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -531,7 +531,6 @@ xfs_bmbt_free_block(

		xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
		xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, -1L);
		xfs_trans_binval(tp, bp);
		return 0;
		}

fs/xfs/libxfs/xfs_btree.c

+23 −9

Original line number	Diff line number	Diff line
		@@ -294,6 +294,21 @@ xfs_btree_sblock_verify_crc(
		return true;
		}

		static int
		xfs_btree_free_block(
		struct xfs_btree_cur *cur,
		struct xfs_buf *bp)
		{
		int error;

		error = cur->bc_ops->free_block(cur, bp);
		if (!error) {
		xfs_trans_binval(cur->bc_tp, bp);
		XFS_BTREE_STATS_INC(cur, free);
		}
		return error;
		}

		/*
		* Delete the btree cursor.
		*/
		@@ -3209,6 +3224,7 @@ xfs_btree_kill_iroot(
		int level;
		int index;
		int numrecs;
		int error;
		#ifdef DEBUG
		union xfs_btree_ptr ptr;
		int i;
		@@ -3272,8 +3288,6 @@ xfs_btree_kill_iroot(
		cpp = xfs_btree_ptr_addr(cur, 1, cblock);
		#ifdef DEBUG
		for (i = 0; i < numrecs; i++) {
		int error;

		error = xfs_btree_check_ptr(cur, cpp, i, level - 1);
		if (error) {
		XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
		@@ -3283,8 +3297,11 @@ xfs_btree_kill_iroot(
		#endif
		xfs_btree_copy_ptrs(cur, pp, cpp, numrecs);

		cur->bc_ops->free_block(cur, cbp);
		XFS_BTREE_STATS_INC(cur, free);
		error = xfs_btree_free_block(cur, cbp);
		if (error) {
		XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
		return error;
		}

		cur->bc_bufs[level - 1] = NULL;
		be16_add_cpu(&block->bb_level, -1);
		@@ -3317,14 +3334,12 @@ xfs_btree_kill_root(
		*/
		cur->bc_ops->set_root(cur, newroot, -1);

		error = cur->bc_ops->free_block(cur, bp);
		error = xfs_btree_free_block(cur, bp);
		if (error) {
		XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
		return error;
		}

		XFS_BTREE_STATS_INC(cur, free);

		cur->bc_bufs[level] = NULL;
		cur->bc_ra[level] = 0;
		cur->bc_nlevels--;
		@@ -3830,10 +3845,9 @@ xfs_btree_delrec(
		}

		/* Free the deleted block. */
		error = cur->bc_ops->free_block(cur, rbp);
		error = xfs_btree_free_block(cur, rbp);
		if (error)
		goto error0;
		XFS_BTREE_STATS_INC(cur, free);

		/*
		* If we joined with the left neighbor, set the buffer in the

fs/xfs/libxfs/xfs_da_format.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -641,6 +641,22 @@ xfs_dir2_block_leaf_p(struct xfs_dir2_block_tail *btp)
		*/
		#define XFS_ATTR_LEAF_MAPSIZE 3 /* how many freespace slots */

		/*
		* Entries are packed toward the top as tight as possible.
		*/
		typedef struct xfs_attr_shortform {
		struct xfs_attr_sf_hdr { /* constant-structure header block */
		__be16 totsize; /* total bytes in shortform list */
		__u8 count; /* count of active entries */
		} hdr;
		struct xfs_attr_sf_entry {
		__uint8_t namelen; /* actual length of name (no NULL) */
		__uint8_t valuelen; /* actual length of value (no NULL) */
		__uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */
		__uint8_t nameval[1]; /* name & value bytes concatenated */
		} list[1]; /* variable sized array */
		} xfs_attr_shortform_t;

		typedef struct xfs_attr_leaf_map { /* RLE map of free bytes */
		__be16 base; /* base of free region */
		__be16 size; /* length of free region */

Admin message