switch the IO-triggering parts of umount to fs_pin

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/fs_pin.c b/fs/fs_pin.c
index 0c77bdc..b06c987 100644 (file)
--- a/fs/fs_pin.c
+++ b/fs/fs_pin.c
@@ -1,7 +1,6 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/fs_pin.h>
 #include "internal.h"
 #include "mount.h"
 

diff --git a/fs/mount.h b/fs/mount.h
index 0ad6f76..6a61c2b 100644 (file)
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -2,6 +2,7 @@
 #include <linux/seq_file.h>
 #include <linux/poll.h>
 #include <linux/ns_common.h>
+#include <linux/fs_pin.h>
 
 struct mnt_namespace {
        atomic_t                count;
@@ -62,7 +63,8 @@ struct mount {
        int mnt_group_id;               /* peer group identifier */
        int mnt_expiry_mark;            /* true if marked for expiry */
        struct hlist_head mnt_pins;
-       struct path mnt_ex_mountpoint;
+       struct fs_pin mnt_umount;
+       struct dentry *mnt_ex_mountpoint;
 };
 
 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */

diff --cc fs/namespace.c
Simple merge