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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi Al,

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

  fs/f2fs/super.c

between commit:

  f80f781514ef ("f2fs: checkpoint disabling")

from the f2fs tree and commit:

  307c6e5241b4 ("vfs: Require specification of size of mount data for internal mounts")

from the vfs 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/super.c
index 952a67b3184a,89970dd81b0e..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -1449,53 -1419,8 +1449,54 @@@ static void default_options(struct f2fs
  #ifdef CONFIG_QUOTA
  static int f2fs_enable_quotas(struct super_block *sb);
  #endif
 +
 +static int f2fs_disable_checkpoint(struct f2fs_sb_info *sbi)
 +{
 +	struct cp_control cpc;
 +	int err;
 +
 +	sbi->sb->s_flags |= SB_ACTIVE;
 +
 +	mutex_lock(&sbi->gc_mutex);
 +	for (; dirty_segments(sbi) > 2 * NR_CURSEG_TYPE;) {
 +		err = f2fs_gc(sbi, true, false, NULL_SEGNO);
 +		if (err == -ENODATA)
 +			break;
 +		if (err && err != -EAGAIN) {
 +			mutex_unlock(&sbi->gc_mutex);
 +			return err;
 +		}
 +	}
 +	mutex_unlock(&sbi->gc_mutex);
 +
 +	err = sync_filesystem(sbi->sb);
 +	if (err)
 +		return err;
 +
 +	mutex_lock(&sbi->gc_mutex);
 +	cpc.reason = CP_PAUSE;
 +	set_sbi_flag(sbi, SBI_CP_DISABLED);
 +	f2fs_write_checkpoint(sbi, &cpc);
 +
 +	sbi->unusable_block_count = 0;
 +	mutex_unlock(&sbi->gc_mutex);
 +	return 0;
 +}
 +
 +static void f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
 +{
 +	mutex_lock(&sbi->gc_mutex);
 +	f2fs_dirty_to_prefree(sbi);
 +
 +	clear_sbi_flag(sbi, SBI_CP_DISABLED);
 +	set_sbi_flag(sbi, SBI_IS_DIRTY);
 +	mutex_unlock(&sbi->gc_mutex);
 +
 +	f2fs_sync_fs(sbi->sb, 1);
 +}
 +
- static int f2fs_remount(struct super_block *sb, int *flags, char *data)
+ static int f2fs_remount(struct super_block *sb, int *flags,
+ 			char *data, size_t data_size)
  {
  	struct f2fs_sb_info *sbi = F2FS_SB(sb);
  	struct f2fs_mount_info org_mount_opt;

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