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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the scsi-post-merge tree got a conflict in
mm/truncate.c between commit ba96a361e21b ("fs: kill i_alloc_sem") from
the vfs tree and commit "Use consistent variable names in
truncate_pagecache(), truncate_setsize()" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc mm/truncate.c
index 003c6c6,a87d838..0000000
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@@ -622,11 -625,12 +625,11 @@@ int vmtruncate_range(struct inode *inod
  		return -ENOSYS;
  
  	mutex_lock(&inode->i_mutex);
 -	down_write(&inode->i_alloc_sem);
 +	inode_dio_wait(inode);
- 	unmap_mapping_range(mapping, offset, (end - offset), 1);
- 	inode->i_op->truncate_range(inode, offset, end);
+ 	unmap_mapping_range(mapping, holebegin, holelen, 1);
+ 	inode->i_op->truncate_range(inode, lstart, lend);
  	/* unmap again to remove racily COWed private pages */
- 	unmap_mapping_range(mapping, offset, (end - offset), 1);
+ 	unmap_mapping_range(mapping, holebegin, holelen, 1);
 -	up_write(&inode->i_alloc_sem);
  	mutex_unlock(&inode->i_mutex);
  
  	return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/