nfsd: move most of nfsfh.h to fs/nfsd

Most of this can be trivially moved to a private header as well.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 7d5ba1b0ffcf240ffd868e8e0a305c144691da24..b26a3644fbb9f01d044a4dd41ac0e27219809506 100644 (file)
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -22,6 +22,7 @@
 #include <net/ipv6.h>
 
 #include "nfsd.h"
+#include "nfsfh.h"
 
 #define NFSDDBG_FACILITY       NFSDDBG_EXPORT
 

diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h
new file mode 100644 (file)
index 0000000..cdfb8c6
--- /dev/null
+++ b/fs/nfsd/nfsfh.h
@@ -0,0 +1,208 @@
+/* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> */
+
+#ifndef _LINUX_NFSD_FH_INT_H
+#define _LINUX_NFSD_FH_INT_H
+
+#include <linux/nfsd/nfsfh.h>
+
+enum nfsd_fsid {
+       FSID_DEV = 0,
+       FSID_NUM,
+       FSID_MAJOR_MINOR,
+       FSID_ENCODE_DEV,
+       FSID_UUID4_INUM,
+       FSID_UUID8,
+       FSID_UUID16,
+       FSID_UUID16_INUM,
+};
+
+enum fsid_source {
+       FSIDSOURCE_DEV,
+       FSIDSOURCE_FSID,
+       FSIDSOURCE_UUID,
+};
+extern enum fsid_source fsid_source(struct svc_fh *fhp);
+
+
+/* This might look a little large to "inline" but in all calls except
+ * one, 'vers' is constant so moste of the function disappears.
+ */
+static inline void mk_fsid(int vers, u32 *fsidv, dev_t dev, ino_t ino,
+                          u32 fsid, unsigned char *uuid)
+{
+       u32 *up;
+       switch(vers) {
+       case FSID_DEV:
+               fsidv[0] = htonl((MAJOR(dev)<<16) |
+                                MINOR(dev));
+               fsidv[1] = ino_t_to_u32(ino);
+               break;
+       case FSID_NUM:
+               fsidv[0] = fsid;
+               break;
+       case FSID_MAJOR_MINOR:
+               fsidv[0] = htonl(MAJOR(dev));
+               fsidv[1] = htonl(MINOR(dev));
+               fsidv[2] = ino_t_to_u32(ino);
+               break;
+
+       case FSID_ENCODE_DEV:
+               fsidv[0] = new_encode_dev(dev);
+               fsidv[1] = ino_t_to_u32(ino);
+               break;
+
+       case FSID_UUID4_INUM:
+               /* 4 byte fsid and inode number */
+               up = (u32*)uuid;
+               fsidv[0] = ino_t_to_u32(ino);
+               fsidv[1] = up[0] ^ up[1] ^ up[2] ^ up[3];
+               break;
+
+       case FSID_UUID8:
+               /* 8 byte fsid  */
+               up = (u32*)uuid;
+               fsidv[0] = up[0] ^ up[2];
+               fsidv[1] = up[1] ^ up[3];
+               break;
+
+       case FSID_UUID16:
+               /* 16 byte fsid - NFSv3+ only */
+               memcpy(fsidv, uuid, 16);
+               break;
+
+       case FSID_UUID16_INUM:
+               /* 8 byte inode and 16 byte fsid */
+               *(u64*)fsidv = (u64)ino;
+               memcpy(fsidv+2, uuid, 16);
+               break;
+       default: BUG();
+       }
+}
+
+static inline int key_len(int type)
+{
+       switch(type) {
+       case FSID_DEV:          return 8;
+       case FSID_NUM:          return 4;
+       case FSID_MAJOR_MINOR:  return 12;
+       case FSID_ENCODE_DEV:   return 8;
+       case FSID_UUID4_INUM:   return 8;
+       case FSID_UUID8:        return 8;
+       case FSID_UUID16:       return 16;
+       case FSID_UUID16_INUM:  return 24;
+       default: return 0;
+       }
+}
+
+/*
+ * Shorthand for dprintk()'s
+ */
+extern char * SVCFH_fmt(struct svc_fh *fhp);
+
+/*
+ * Function prototypes
+ */
+__be32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int);
+__be32 fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *);
+__be32 fh_update(struct svc_fh *);
+void   fh_put(struct svc_fh *);
+
+static __inline__ struct svc_fh *
+fh_copy(struct svc_fh *dst, struct svc_fh *src)
+{
+       WARN_ON(src->fh_dentry || src->fh_locked);
+                       
+       *dst = *src;
+       return dst;
+}
+
+static inline void
+fh_copy_shallow(struct knfsd_fh *dst, struct knfsd_fh *src)
+{
+       dst->fh_size = src->fh_size;
+       memcpy(&dst->fh_base, &src->fh_base, src->fh_size);
+}
+
+static __inline__ struct svc_fh *
+fh_init(struct svc_fh *fhp, int maxsize)
+{
+       memset(fhp, 0, sizeof(*fhp));
+       fhp->fh_maxsize = maxsize;
+       return fhp;
+}
+
+#ifdef CONFIG_NFSD_V3
+/*
+ * Fill in the pre_op attr for the wcc data
+ */
+static inline void
+fill_pre_wcc(struct svc_fh *fhp)
+{
+       struct inode    *inode;
+
+       inode = fhp->fh_dentry->d_inode;
+       if (!fhp->fh_pre_saved) {
+               fhp->fh_pre_mtime = inode->i_mtime;
+               fhp->fh_pre_ctime = inode->i_ctime;
+               fhp->fh_pre_size  = inode->i_size;
+               fhp->fh_pre_change = inode->i_version;
+               fhp->fh_pre_saved = 1;
+       }
+}
+
+extern void fill_post_wcc(struct svc_fh *);
+#else
+#define        fill_pre_wcc(ignored)
+#define fill_post_wcc(notused)
+#endif /* CONFIG_NFSD_V3 */
+
+
+/*
+ * Lock a file handle/inode
+ * NOTE: both fh_lock and fh_unlock are done "by hand" in
+ * vfs.c:nfsd_rename as it needs to grab 2 i_mutex's at once
+ * so, any changes here should be reflected there.
+ */
+
+static inline void
+fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
+{
+       struct dentry   *dentry = fhp->fh_dentry;
+       struct inode    *inode;
+
+       BUG_ON(!dentry);
+
+       if (fhp->fh_locked) {
+               printk(KERN_WARNING "fh_lock: %s/%s already locked!\n",
+                       dentry->d_parent->d_name.name, dentry->d_name.name);
+               return;
+       }
+
+       inode = dentry->d_inode;
+       mutex_lock_nested(&inode->i_mutex, subclass);
+       fill_pre_wcc(fhp);
+       fhp->fh_locked = 1;
+}
+
+static inline void
+fh_lock(struct svc_fh *fhp)
+{
+       fh_lock_nested(fhp, I_MUTEX_NORMAL);
+}
+
+/*
+ * Unlock a file handle/inode
+ */
+static inline void
+fh_unlock(struct svc_fh *fhp)
+{
+       BUG_ON(!fhp->fh_dentry);
+
+       if (fhp->fh_locked) {
+               fill_post_wcc(fhp);
+               mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex);
+               fhp->fh_locked = 0;
+       }
+}
+
+#endif /* _LINUX_NFSD_FH_INT_H */

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 2af75686e0d3f9cc9d4b28eb232f7c97ce77de3a..775b8d281d6ad53939e9fdeb4c6ecea4819e4502 100644 (file)
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -38,6 +38,7 @@
 #define _NFSD4_STATE_H
 
 #include <linux/nfsd/nfsfh.h>
+#include "nfsfh.h"
 
 typedef struct {
        u32             cl_boot;

diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index f4fa6d351bbdee925f52bf51898cf88e30688aed..4b1de0a9ea757e957b1c7df0788d092441d79242 100644 (file)
--- a/fs/nfsd/vfs.h
+++ b/fs/nfsd/vfs.h
@@ -5,6 +5,8 @@
 #ifndef LINUX_NFSD_VFS_H
 #define LINUX_NFSD_VFS_H
 
+#include "nfsfh.h"
+
 /*
  * Flags for nfsd_permission
  */

diff --git a/fs/nfsd/xdr.h b/fs/nfsd/xdr.h
index 235ee5c3be542aaf4bb3c79f15133f1d948bb20a..87fe6f64b8f73503660461c3df0b293166b9ae7d 100644 (file)
--- a/fs/nfsd/xdr.h
+++ b/fs/nfsd/xdr.h
@@ -9,6 +9,7 @@
 
 #include <linux/vfs.h>
 #include "nfsd.h"
+#include "nfsfh.h"
 
 struct nfsd_fhandle {
        struct svc_fh           fh;

diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index 49523edbc510352d86259541944fca57a3613929..65e333afaee41fb93740aed7f4ace5c17aa891d3 100644 (file)
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -162,205 +162,6 @@ typedef struct svc_fh {
 
 } svc_fh;
 
-enum nfsd_fsid {
-       FSID_DEV = 0,
-       FSID_NUM,
-       FSID_MAJOR_MINOR,
-       FSID_ENCODE_DEV,
-       FSID_UUID4_INUM,
-       FSID_UUID8,
-       FSID_UUID16,
-       FSID_UUID16_INUM,
-};
-
-enum fsid_source {
-       FSIDSOURCE_DEV,
-       FSIDSOURCE_FSID,
-       FSIDSOURCE_UUID,
-};
-extern enum fsid_source fsid_source(struct svc_fh *fhp);
-
-
-/* This might look a little large to "inline" but in all calls except
- * one, 'vers' is constant so moste of the function disappears.
- */
-static inline void mk_fsid(int vers, u32 *fsidv, dev_t dev, ino_t ino,
-                          u32 fsid, unsigned char *uuid)
-{
-       u32 *up;
-       switch(vers) {
-       case FSID_DEV:
-               fsidv[0] = htonl((MAJOR(dev)<<16) |
-                                MINOR(dev));
-               fsidv[1] = ino_t_to_u32(ino);
-               break;
-       case FSID_NUM:
-               fsidv[0] = fsid;
-               break;
-       case FSID_MAJOR_MINOR:
-               fsidv[0] = htonl(MAJOR(dev));
-               fsidv[1] = htonl(MINOR(dev));
-               fsidv[2] = ino_t_to_u32(ino);
-               break;
-
-       case FSID_ENCODE_DEV:
-               fsidv[0] = new_encode_dev(dev);
-               fsidv[1] = ino_t_to_u32(ino);
-               break;
-
-       case FSID_UUID4_INUM:
-               /* 4 byte fsid and inode number */
-               up = (u32*)uuid;
-               fsidv[0] = ino_t_to_u32(ino);
-               fsidv[1] = up[0] ^ up[1] ^ up[2] ^ up[3];
-               break;
-
-       case FSID_UUID8:
-               /* 8 byte fsid  */
-               up = (u32*)uuid;
-               fsidv[0] = up[0] ^ up[2];
-               fsidv[1] = up[1] ^ up[3];
-               break;
-
-       case FSID_UUID16:
-               /* 16 byte fsid - NFSv3+ only */
-               memcpy(fsidv, uuid, 16);
-               break;
-
-       case FSID_UUID16_INUM:
-               /* 8 byte inode and 16 byte fsid */
-               *(u64*)fsidv = (u64)ino;
-               memcpy(fsidv+2, uuid, 16);
-               break;
-       default: BUG();
-       }
-}
-
-static inline int key_len(int type)
-{
-       switch(type) {
-       case FSID_DEV:          return 8;
-       case FSID_NUM:          return 4;
-       case FSID_MAJOR_MINOR:  return 12;
-       case FSID_ENCODE_DEV:   return 8;
-       case FSID_UUID4_INUM:   return 8;
-       case FSID_UUID8:        return 8;
-       case FSID_UUID16:       return 16;
-       case FSID_UUID16_INUM:  return 24;
-       default: return 0;
-       }
-}
-
-/*
- * Shorthand for dprintk()'s
- */
-extern char * SVCFH_fmt(struct svc_fh *fhp);
-
-/*
- * Function prototypes
- */
-__be32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int);
-__be32 fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *);
-__be32 fh_update(struct svc_fh *);
-void   fh_put(struct svc_fh *);
-
-static __inline__ struct svc_fh *
-fh_copy(struct svc_fh *dst, struct svc_fh *src)
-{
-       WARN_ON(src->fh_dentry || src->fh_locked);
-                       
-       *dst = *src;
-       return dst;
-}
-
-static inline void
-fh_copy_shallow(struct knfsd_fh *dst, struct knfsd_fh *src)
-{
-       dst->fh_size = src->fh_size;
-       memcpy(&dst->fh_base, &src->fh_base, src->fh_size);
-}
-
-static __inline__ struct svc_fh *
-fh_init(struct svc_fh *fhp, int maxsize)
-{
-       memset(fhp, 0, sizeof(*fhp));
-       fhp->fh_maxsize = maxsize;
-       return fhp;
-}
-
-#ifdef CONFIG_NFSD_V3
-/*
- * Fill in the pre_op attr for the wcc data
- */
-static inline void
-fill_pre_wcc(struct svc_fh *fhp)
-{
-       struct inode    *inode;
-
-       inode = fhp->fh_dentry->d_inode;
-       if (!fhp->fh_pre_saved) {
-               fhp->fh_pre_mtime = inode->i_mtime;
-               fhp->fh_pre_ctime = inode->i_ctime;
-               fhp->fh_pre_size  = inode->i_size;
-               fhp->fh_pre_change = inode->i_version;
-               fhp->fh_pre_saved = 1;
-       }
-}
-
-extern void fill_post_wcc(struct svc_fh *);
-#else
-#define        fill_pre_wcc(ignored)
-#define fill_post_wcc(notused)
-#endif /* CONFIG_NFSD_V3 */
-
-
-/*
- * Lock a file handle/inode
- * NOTE: both fh_lock and fh_unlock are done "by hand" in
- * vfs.c:nfsd_rename as it needs to grab 2 i_mutex's at once
- * so, any changes here should be reflected there.
- */
-
-static inline void
-fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
-{
-       struct dentry   *dentry = fhp->fh_dentry;
-       struct inode    *inode;
-
-       BUG_ON(!dentry);
-
-       if (fhp->fh_locked) {
-               printk(KERN_WARNING "fh_lock: %s/%s already locked!\n",
-                       dentry->d_parent->d_name.name, dentry->d_name.name);
-               return;
-       }
-
-       inode = dentry->d_inode;
-       mutex_lock_nested(&inode->i_mutex, subclass);
-       fill_pre_wcc(fhp);
-       fhp->fh_locked = 1;
-}
-
-static inline void
-fh_lock(struct svc_fh *fhp)
-{
-       fh_lock_nested(fhp, I_MUTEX_NORMAL);
-}
-
-/*
- * Unlock a file handle/inode
- */
-static inline void
-fh_unlock(struct svc_fh *fhp)
-{
-       BUG_ON(!fhp->fh_dentry);
-
-       if (fhp->fh_locked) {
-               fill_post_wcc(fhp);
-               mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex);
-               fhp->fh_locked = 0;
-       }
-}
 #endif /* __KERNEL__ */