Today's linux-next merge of the userns tree got a conflict in fs/fuse/dir.c between 3c70b8eed (fuse: don't check_submounts_and_drop() in RCU walk) in the fuse tree and 40216baa0 (vfs: Lazily remove mounts on unlinked files and directories. v2) in the userns tree.
I fixed it up as below and can carry as required:
diff --cc fs/fuse/dir.c
index 0747f6e,b1cd7b7..0000000
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@@ -263,9 -259,7 +263,10 @@@ out
invalid:
ret = 0;
- shrink_submounts_and_drop(entry);
+
- if (!(flags & LOOKUP_RCU) && check_submounts_and_drop(entry) != 0)
- ret = 1;
++ if (!(flags & LOOKUP_RCU))
++ shrink_submounts_and_drop(entry);
++
goto out;
}
signature.asc
Description: Digital signature
