linux-next: manual merge of the fs-next tree with the mm-nonmm-unstable tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 4049 bytes --]

Hi all,

Today's linux-next merge of the fs-next tree got a conflict in:

  fs/ocfs2/dir.c

between commits:

  bdff37e327275 ("ocfs2: validate dx_root extent list fields during block read")
  28c33de101792 ("ocfs2: remove empty extent list check in ocfs2_dx_dir_lookup_rec()")

from the mm-nonmm-unstable tree and commit:

  0b2600f81cefc ("treewide: change inode->i_ino from unsigned long to u64")

from the fs-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined fs/ocfs2/dir.c
index d94595a499231,b82fe4431eb1f..0000000000000
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@@ -593,7 -593,7 +593,7 @@@ static int ocfs2_validate_dx_root(struc
  		mlog(ML_ERROR,
  		     "Checksum failed for dir index root block %llu\n",
  		     (unsigned long long)bh->b_blocknr);
 -		return ret;
 +		goto bail;
  	}
  
  	if (!OCFS2_IS_VALID_DX_ROOT(dx_root)) {
@@@ -601,32 -601,8 +601,32 @@@
  				  "Dir Index Root # %llu has bad signature %.*s\n",
  				  (unsigned long long)le64_to_cpu(dx_root->dr_blkno),
  				  7, dx_root->dr_signature);
 +		goto bail;
  	}
  
 +	if (!(dx_root->dr_flags & OCFS2_DX_FLAG_INLINE)) {
 +		struct ocfs2_extent_list *el = &dx_root->dr_list;
 +
 +		if (le16_to_cpu(el->l_count) != ocfs2_extent_recs_per_dx_root(sb)) {
 +			ret = ocfs2_error(sb,
 +					  "Dir Index Root # %llu has invalid l_count %u (expected %u)\n",
 +					  (unsigned long long)le64_to_cpu(dx_root->dr_blkno),
 +					  le16_to_cpu(el->l_count),
 +					  ocfs2_extent_recs_per_dx_root(sb));
 +			goto bail;
 +		}
 +
 +		if (le16_to_cpu(el->l_next_free_rec) > le16_to_cpu(el->l_count)) {
 +			ret = ocfs2_error(sb,
 +					  "Dir Index Root # %llu has invalid l_next_free_rec %u (l_count %u)\n",
 +					  (unsigned long long)le64_to_cpu(dx_root->dr_blkno),
 +					  le16_to_cpu(el->l_next_free_rec),
 +					  le16_to_cpu(el->l_count));
 +			goto bail;
 +		}
 +	}
 +
 +bail:
  	return ret;
  }
  
@@@ -815,6 -791,14 +815,6 @@@ static int ocfs2_dx_dir_lookup_rec(stru
  	struct ocfs2_extent_block *eb;
  	struct ocfs2_extent_rec *rec = NULL;
  
 -	if (le16_to_cpu(el->l_count) !=
 -	    ocfs2_extent_recs_per_dx_root(inode->i_sb)) {
 -		ret = ocfs2_error(inode->i_sb,
 -				  "Inode %llu has invalid extent list length %u\n",
 -				  inode->i_ino, le16_to_cpu(el->l_count));
 -		goto out;
 -	}
 -
  	if (el->l_tree_depth) {
  		ret = ocfs2_find_leaf(INODE_CACHE(inode), el, major_hash,
  				      &eb_bh);
@@@ -828,13 -812,21 +828,13 @@@
  
  		if (el->l_tree_depth) {
  			ret = ocfs2_error(inode->i_sb,
- 					  "Inode %lu has non zero tree depth in btree tree block %llu\n",
+ 					  "Inode %llu has non zero tree depth in btree tree block %llu\n",
  					  inode->i_ino,
  					  (unsigned long long)eb_bh->b_blocknr);
  			goto out;
  		}
  	}
  
 -	if (le16_to_cpu(el->l_next_free_rec) == 0) {
 -		ret = ocfs2_error(inode->i_sb,
 -				  "Inode %llu has empty extent list at depth %u\n",
 -				  inode->i_ino,
 -				  le16_to_cpu(el->l_tree_depth));
 -		goto out;
 -	}
 -
  	found = 0;
  	for (i = le16_to_cpu(el->l_next_free_rec) - 1; i >= 0; i--) {
  		rec = &el->l_recs[i];
@@@ -847,9 -839,10 +847,9 @@@
  
  	if (!found) {
  		ret = ocfs2_error(inode->i_sb,
- 				  "Inode %lu has no extent record for hash %u in btree (next_free_rec %u)\n",
 -				  "Inode %llu has bad extent record (%u, %u, 0) in btree\n",
 -				  inode->i_ino,
 -				  le32_to_cpu(rec->e_cpos),
 -				  ocfs2_rec_clusters(el, rec));
++				  "Inode %llu has no extent record for hash %u in btree (next_free_rec %u)\n",
 +				  inode->i_ino, major_hash,
 +				  le16_to_cpu(el->l_next_free_rec));
  		goto out;
  	}
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]