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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
	Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Sukadev Bhattiprolu <sukadev@us.ibm.com>,
	Miklos Szeredi <mszeredi@suse.cz>
Subject: linux-next: manual merge of the akpm-current tree with the vfs tree
Date: Fri, 8 Nov 2013 18:35:52 +1100	[thread overview]
Message-ID: <20131108183552.dbe7c66fa6dee7f84bf73b44@canb.auug.org.au> (raw)

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

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/autofs4/inode.c between commit baa40671d3e3 ("autofs4: make freeing
sbi rcu-delayed") from the vfs tree and commit e4af471815fc ("autofs4:
allow autofs to work outside the initial PID namespace") from the
akpm-current tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/autofs4/inode.c
index 3b9cc9b973c2,1b045ecfcea2..000000000000

--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@@ -56,13 -56,20 +56,15 @@@ void autofs4_kill_sb(struct super_bloc
  	 * just call kill_anon_super when we are called from
  	 * deactivate_super.
  	 */
- 	if (sbi) /* Free wait queues, close pipe */
 -	if (!sbi)
 -		goto out_kill_sb;
 -
 -	/* Free wait queues, close pipe */
 -	autofs4_catatonic_mode(sbi);
 -
 -	put_pid(sbi->oz_pgrp);
 -
 -	sb->s_fs_info = NULL;
 -	kfree(sbi);
++	if (sbi) { /* Free wait queues, close pipe */
 +		autofs4_catatonic_mode(sbi);
++		put_pid(sbi->oz_pgrp);
++	}
  
 -out_kill_sb:
  	DPRINTK("shutting down");
  	kill_litter_super(sb);
 +	if (sbi)
 +		kfree_rcu(sbi, rcu);
  }
  
  static int autofs4_show_options(struct seq_file *m, struct dentry *root)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
