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@xxxxxxxxxxxxxxxx
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:
pgpJuARCKhGIA.pgp
Description: PGP signature
