linux-next: manual merge of the f2fs tree with the ext3 tree

[Stephen Rothwell]

Hi all,

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

  fs/f2fs/file.c

between commit:

  edc6d01bad73 ("f2fs: Convert to using invalidate_lock")

from the ext3 tree and commit:

  4817758c80ad ("f2fs: adjust unlock order for cleanup")

from the f2fs 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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/f2fs/file.c
index 1ff333755721,3330efb41f22..000000000000
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@@ -3473,8 -3496,8 +3494,8 @@@ static int f2fs_release_compress_blocks
  		released_blocks += ret;
  	}
  
- 	up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 -	up_write(&F2FS_I(inode)->i_mmap_sem);
 +	filemap_invalidate_unlock(inode->i_mapping);
+ 	up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
  out:
  	inode_unlock(inode);
  
@@@ -3626,8 -3649,8 +3647,8 @@@ static int f2fs_reserve_compress_blocks
  		reserved_blocks += ret;
  	}
  
- 	up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 -	up_write(&F2FS_I(inode)->i_mmap_sem);
 +	filemap_invalidate_unlock(inode->i_mapping);
+ 	up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
  
  	if (ret >= 0) {
  		clear_inode_flag(inode, FI_COMPRESS_RELEASED);

Attachment: pgpENNFnfuQ1a.pgp
Description: OpenPGP digital signature