[PATCH] move mount.h out of fs_struct.h

It's only need for the two monster-inlines set_fs_root and set_fs_pwd
that should better be out of line anyway.  Some additional cleanup like
named initializers as extra bonus.

diff --git a/fs/namespace.c b/fs/namespace.c
index 29eb5d0b5469fd241458e329198ca6201fb05db2..567873a1713e282ebc83fb296c86f5ac28bede63 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -881,6 +881,54 @@ out1:
        return retval;
 }
 
+/*
+ * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
+ * It can block. Requires the big lock held.
+ */
+void set_fs_root(struct fs_struct *fs, struct vfsmount *mnt,
+                struct dentry *dentry)
+{
+       struct dentry *old_root;
+       struct vfsmount *old_rootmnt;
+       write_lock(&fs->lock);
+       spin_lock(&dcache_lock);
+       old_root = fs->root;
+       old_rootmnt = fs->rootmnt;
+       fs->rootmnt = mntget(mnt);
+       fs->root = dget(dentry);
+       spin_unlock(&dcache_lock);
+       write_unlock(&fs->lock);
+       if (old_root) {
+               dput(old_root);
+               mntput(old_rootmnt);
+       }
+}
+
+/*
+ * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values.
+ * It can block. Requires the big lock held.
+ */
+void set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
+               struct dentry *dentry)
+{
+       struct dentry *old_pwd;
+       struct vfsmount *old_pwdmnt;
+
+       write_lock(&fs->lock);
+       spin_lock(&dcache_lock);
+       old_pwd = fs->pwd;
+       old_pwdmnt = fs->pwdmnt;
+       fs->pwdmnt = mntget(mnt);
+       fs->pwd = dget(dentry);
+       spin_unlock(&dcache_lock);
+       write_unlock(&fs->lock);
+
+       if (old_pwd) {
+               dput(old_pwd);
+               mntput(old_pwdmnt);
+       }
+}
+
 static void chroot_fs_refs(struct nameidata *old_nd, struct nameidata *new_nd)
 {
        struct task_struct *g, *p;

diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index 9ca04a715fe3c98aa1877ed28b4cab38f8fb3dc9..c623d12a486e6e1deb90a6ab65d4b71e6b81aab3 100644 (file)
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -1,9 +1,8 @@
 #ifndef _LINUX_FS_STRUCT_H
 #define _LINUX_FS_STRUCT_H
-#ifdef __KERNEL__
 
-#include <linux/mount.h>
-#include <linux/dcache.h>
+struct dentry;
+struct vfsmount;
 
 struct fs_struct {
        atomic_t count;
@@ -13,68 +12,17 @@ struct fs_struct {
        struct vfsmount * rootmnt, * pwdmnt, * altrootmnt;
 };
 
-#define INIT_FS { \
-       ATOMIC_INIT(1), \
-       RW_LOCK_UNLOCKED, \
-       0022, \
-       NULL, NULL, NULL, NULL, NULL, NULL \
+#define INIT_FS {                              \
+       .count          = ATOMIC_INIT(1),       \
+       .lock           = RW_LOCK_UNLOCKED,     \
+       .umask          = 0022, \
 }
 
 extern void exit_fs(struct task_struct *);
 extern void set_fs_altroot(void);
+extern void set_fs_root(struct fs_struct *, struct vfsmount *, struct dentry *);
+extern void set_fs_pwd(struct fs_struct *, struct vfsmount *, struct dentry *);
+extern struct fs_struct *copy_fs_struct(struct fs_struct *);
+extern void put_fs_struct(struct fs_struct *);
 
-/*
- * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
- * It can block. Requires the big lock held.
- */
-
-static inline void set_fs_root(struct fs_struct *fs,
-       struct vfsmount *mnt,
-       struct dentry *dentry)
-{
-       struct dentry *old_root;
-       struct vfsmount *old_rootmnt;
-       write_lock(&fs->lock);
-       spin_lock(&dcache_lock);
-       old_root = fs->root;
-       old_rootmnt = fs->rootmnt;
-       fs->rootmnt = mntget(mnt);
-       fs->root = dget(dentry);
-       spin_unlock(&dcache_lock);
-       write_unlock(&fs->lock);
-       if (old_root) {
-               dput(old_root);
-               mntput(old_rootmnt);
-       }
-}
-
-/*
- * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values.
- * It can block. Requires the big lock held.
- */
-
-static inline void set_fs_pwd(struct fs_struct *fs,
-       struct vfsmount *mnt,
-       struct dentry *dentry)
-{
-       struct dentry *old_pwd;
-       struct vfsmount *old_pwdmnt;
-       write_lock(&fs->lock);
-       spin_lock(&dcache_lock);
-       old_pwd = fs->pwd;
-       old_pwdmnt = fs->pwdmnt;
-       fs->pwdmnt = mntget(mnt);
-       fs->pwd = dget(dentry);
-       spin_unlock(&dcache_lock);
-       write_unlock(&fs->lock);
-       if (old_pwd) {
-               dput(old_pwd);
-               mntput(old_pwdmnt);
-       }
-}
-
-struct fs_struct *copy_fs_struct(struct fs_struct *old);
-void put_fs_struct(struct fs_struct *fs);
-
-#endif
-#endif
+#endif /* _LINUX_FS_STRUCT_H */