linux-next: manual merge of the akpm tree with the ext4 tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/ext4/extents_status.c between commit 49c6efc7b80e ("ext4: add new
ioctl EXT4_IOC_PRECACHE_EXTENTS") from the ext4 tree and commit
"fs-convert-fs-shrinkers-to-new-scan-count-api-fix" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/ext4/extents_status.c
index 28e2627,0361206..0000000
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@@ -947,13 -909,23 +947,15 @@@ static int __ext4_es_shrink(struct ext4
  	struct ext4_inode_info *ei;
  	struct list_head *cur, *tmp;
  	LIST_HEAD(skiped);
- 	int ret, nr_shrunk = 0;
+ 	unsigned long nr_shrunk = 0;
 +	int retried = 0, skip_precached = 1, nr_skipped = 0;
  
  	spin_lock(&sbi->s_es_lru_lock);
  
 -	/*
 -	 * If the inode that is at the head of LRU list is newer than
 -	 * last_sorted time, that means that we need to sort this list.
 -	 */
 -	ei = list_first_entry(&sbi->s_es_lru, struct ext4_inode_info, i_es_lru);
 -	if (sbi->s_es_last_sorted < ei->i_touch_when) {
 -		list_sort(NULL, &sbi->s_es_lru, ext4_inode_touch_time_cmp);
 -		sbi->s_es_last_sorted = jiffies;
 -	}
 -
 +retry:
  	list_for_each_safe(cur, tmp, &sbi->s_es_lru) {
+ 		int ret;
+ 
  		/*
  		 * If we have already reclaimed all extents from extent
  		 * status tree, just stop the loop immediately.

Attachment: pgp00000.pgp
Description: PGP signature