vfs: all counters taken to struct mount

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

diff --git a/fs/mount.h b/fs/mount.h
index 853738f5897f32bbcc15fa3f507a73d53d570208..452ae41e013111d1d3980867ce7186657bfc27c2 100644 (file)
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -1,10 +1,22 @@
 #include <linux/mount.h>
 
+struct mnt_pcp {
+       int mnt_count;
+       int mnt_writers;
+};
+
 struct mount {
        struct list_head mnt_hash;
        struct mount *mnt_parent;
        struct dentry *mnt_mountpoint;
        struct vfsmount mnt;
+#ifdef CONFIG_SMP
+       struct mnt_pcp __percpu *mnt_pcp;
+       atomic_t mnt_longterm;          /* how many of the refs are longterm */
+#else
+       int mnt_count;
+       int mnt_writers;
+#endif
 };
 
 static inline struct mount *real_mount(struct vfsmount *mnt)

diff --git a/fs/namespace.c b/fs/namespace.c
index a13165c871c294002c3352c73d7267a5a0d4257e..3fdd30add4f9e383337d8e8695487a4b0d76fb02 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -144,10 +144,10 @@ void mnt_release_group_id(struct mount *mnt)
 static inline void mnt_add_count(struct mount *mnt, int n)
 {
 #ifdef CONFIG_SMP
-       this_cpu_add(mnt->mnt.mnt_pcp->mnt_count, n);
+       this_cpu_add(mnt->mnt_pcp->mnt_count, n);
 #else
        preempt_disable();
-       mnt->mnt.mnt_count += n;
+       mnt->mnt_count += n;
        preempt_enable();
 #endif
 }
@@ -162,12 +162,12 @@ unsigned int mnt_get_count(struct mount *mnt)
        int cpu;
 
        for_each_possible_cpu(cpu) {
-               count += per_cpu_ptr(mnt->mnt.mnt_pcp, cpu)->mnt_count;
+               count += per_cpu_ptr(mnt->mnt_pcp, cpu)->mnt_count;
        }
 
        return count;
 #else
-       return mnt->mnt.mnt_count;
+       return mnt->mnt_count;
 #endif
 }
 
@@ -189,14 +189,14 @@ static struct mount *alloc_vfsmnt(const char *name)
                }
 
 #ifdef CONFIG_SMP
-               mnt->mnt_pcp = alloc_percpu(struct mnt_pcp);
-               if (!mnt->mnt_pcp)
+               p->mnt_pcp = alloc_percpu(struct mnt_pcp);
+               if (!p->mnt_pcp)
                        goto out_free_devname;
 
-               this_cpu_add(mnt->mnt_pcp->mnt_count, 1);
+               this_cpu_add(p->mnt_pcp->mnt_count, 1);
 #else
-               mnt->mnt_count = 1;
-               mnt->mnt_writers = 0;
+               p->mnt_count = 1;
+               p->mnt_writers = 0;
 #endif
 
                INIT_LIST_HEAD(&p->mnt_hash);
@@ -256,18 +256,18 @@ EXPORT_SYMBOL_GPL(__mnt_is_readonly);
 static inline void mnt_inc_writers(struct mount *mnt)
 {
 #ifdef CONFIG_SMP
-       this_cpu_inc(mnt->mnt.mnt_pcp->mnt_writers);
+       this_cpu_inc(mnt->mnt_pcp->mnt_writers);
 #else
-       mnt->mnt.mnt_writers++;
+       mnt->mnt_writers++;
 #endif
 }
 
 static inline void mnt_dec_writers(struct mount *mnt)
 {
 #ifdef CONFIG_SMP
-       this_cpu_dec(mnt->mnt.mnt_pcp->mnt_writers);
+       this_cpu_dec(mnt->mnt_pcp->mnt_writers);
 #else
-       mnt->mnt.mnt_writers--;
+       mnt->mnt_writers--;
 #endif
 }
 
@@ -278,7 +278,7 @@ static unsigned int mnt_get_writers(struct mount *mnt)
        int cpu;
 
        for_each_possible_cpu(cpu) {
-               count += per_cpu_ptr(mnt->mnt.mnt_pcp, cpu)->mnt_writers;
+               count += per_cpu_ptr(mnt->mnt_pcp, cpu)->mnt_writers;
        }
 
        return count;
@@ -454,7 +454,7 @@ static void free_vfsmnt(struct mount *mnt)
        kfree(mnt->mnt.mnt_devname);
        mnt_free_id(mnt);
 #ifdef CONFIG_SMP
-       free_percpu(mnt->mnt.mnt_pcp);
+       free_percpu(mnt->mnt_pcp);
 #endif
        kmem_cache_free(mnt_cache, mnt);
 }
@@ -594,7 +594,7 @@ static void attach_mnt(struct mount *mnt, struct path *path)
 static inline void __mnt_make_longterm(struct mount *mnt)
 {
 #ifdef CONFIG_SMP
-       atomic_inc(&mnt->mnt.mnt_longterm);
+       atomic_inc(&mnt->mnt_longterm);
 #endif
 }
 
@@ -602,7 +602,7 @@ static inline void __mnt_make_longterm(struct mount *mnt)
 static inline void __mnt_make_shortterm(struct mount *mnt)
 {
 #ifdef CONFIG_SMP
-       atomic_dec(&mnt->mnt.mnt_longterm);
+       atomic_dec(&mnt->mnt_longterm);
 #endif
 }
 
@@ -769,7 +769,7 @@ static void mntput_no_expire(struct vfsmount *m)
 put_again:
 #ifdef CONFIG_SMP
        br_read_lock(vfsmount_lock);
-       if (likely(atomic_read(&mnt->mnt.mnt_longterm))) {
+       if (likely(atomic_read(&mnt->mnt_longterm))) {
                mnt_add_count(mnt, -1);
                br_read_unlock(vfsmount_lock);
                return;
@@ -2375,10 +2375,10 @@ void mnt_make_shortterm(struct vfsmount *m)
 {
 #ifdef CONFIG_SMP
        struct mount *mnt = real_mount(m);
-       if (atomic_add_unless(&mnt->mnt.mnt_longterm, -1, 1))
+       if (atomic_add_unless(&mnt->mnt_longterm, -1, 1))
                return;
        br_write_lock(vfsmount_lock);
-       atomic_dec(&mnt->mnt.mnt_longterm);
+       atomic_dec(&mnt->mnt_longterm);
        br_write_unlock(vfsmount_lock);
 #endif
 }

diff --git a/include/linux/mount.h b/include/linux/mount.h
index e3f005993d0f826ec5a64e969aaf5c2e46f1157e..cc01ed1bc71940dc5fedbc23f2031570a694cc1b 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -47,21 +47,9 @@ struct mnt_namespace;
 
 #define MNT_INTERNAL   0x4000
 
-struct mnt_pcp {
-       int mnt_count;
-       int mnt_writers;
-};
-
 struct vfsmount {
        struct dentry *mnt_root;        /* root of the mounted tree */
        struct super_block *mnt_sb;     /* pointer to superblock */
-#ifdef CONFIG_SMP
-       struct mnt_pcp __percpu *mnt_pcp;
-       atomic_t mnt_longterm;          /* how many of the refs are longterm */
-#else
-       int mnt_count;
-       int mnt_writers;
-#endif
        struct list_head mnt_mounts;    /* list of children, anchored here */
        struct list_head mnt_child;     /* and going through their mnt_child */
        int mnt_flags;