nfsd: remove <linux/nfsd/nfsfh.h>
The only real user of this header is fs/nfsd/nfsfh.h, so merge the two. Various lockѕ source files used it to indirectly get other sunrpc or nfs headers, so fix those up. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com>hifive-unleashed-5.1
Christoph Hellwig
J. Bruce Fields
parent
4dd86e150f
commit
9c69de4c94
|
|
@ -14,6 +14,8 @@
|
|||
#include <linux/sunrpc/stats.h>
|
||||
#include <linux/lockd/lockd.h>
|
||||
|
||||
#include <uapi/linux/nfs3.h>
|
||||
|
||||
#define NLMDBG_FACILITY NLMDBG_XDR
|
||||
|
||||
#if (NLMCLNT_OHSIZE > XDR_MAX_NETOBJ)
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
#include <linux/sunrpc/stats.h>
|
||||
#include <linux/lockd/lockd.h>
|
||||
|
||||
#include <uapi/linux/nfs2.h>
|
||||
|
||||
#define NLMDBG_FACILITY NLMDBG_XDR
|
||||
|
||||
#if (NLMCLNT_OHSIZE > XDR_MAX_NETOBJ)
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@
|
|||
#include <linux/mutex.h>
|
||||
#include <linux/sunrpc/svc.h>
|
||||
#include <linux/sunrpc/addr.h>
|
||||
#include <linux/nfsd/nfsfh.h>
|
||||
#include <linux/nfsd/export.h>
|
||||
#include <linux/lockd/lockd.h>
|
||||
#include <linux/lockd/share.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mount.h>
|
||||
#include <uapi/linux/nfs2.h>
|
||||
|
||||
#define NLMDBG_FACILITY NLMDBG_SVCSUBS
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@
|
|||
#include <linux/sunrpc/stats.h>
|
||||
#include <linux/lockd/lockd.h>
|
||||
|
||||
#include <uapi/linux/nfs2.h>
|
||||
|
||||
#define NLMDBG_FACILITY NLMDBG_XDR
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include <linux/nfs2.h>
|
||||
#include <linux/nfs3.h>
|
||||
#include <linux/nfs4.h>
|
||||
#include <linux/sunrpc/svc.h>
|
||||
#include <linux/sunrpc/msg_prot.h>
|
||||
|
||||
#include <linux/nfsd/debug.h>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,58 @@
|
|||
/* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> */
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
|
||||
*
|
||||
* This file describes the layout of the file handles as passed
|
||||
* over the wire.
|
||||
*/
|
||||
#ifndef _LINUX_NFSD_NFSFH_H
|
||||
#define _LINUX_NFSD_NFSFH_H
|
||||
|
||||
#ifndef _LINUX_NFSD_FH_INT_H
|
||||
#define _LINUX_NFSD_FH_INT_H
|
||||
#include <linux/sunrpc/svc.h>
|
||||
#include <uapi/linux/nfsd/nfsfh.h>
|
||||
|
||||
#include <linux/nfsd/nfsfh.h>
|
||||
static inline __u32 ino_t_to_u32(ino_t ino)
|
||||
{
|
||||
return (__u32) ino;
|
||||
}
|
||||
|
||||
static inline ino_t u32_to_ino_t(__u32 uino)
|
||||
{
|
||||
return (ino_t) uino;
|
||||
}
|
||||
|
||||
/*
|
||||
* This is the internal representation of an NFS handle used in knfsd.
|
||||
* pre_mtime/post_version will be used to support wcc_attr's in NFSv3.
|
||||
*/
|
||||
typedef struct svc_fh {
|
||||
struct knfsd_fh fh_handle; /* FH data */
|
||||
struct dentry * fh_dentry; /* validated dentry */
|
||||
struct svc_export * fh_export; /* export pointer */
|
||||
int fh_maxsize; /* max size for fh_handle */
|
||||
|
||||
unsigned char fh_locked; /* inode locked by us */
|
||||
unsigned char fh_want_write; /* remount protection taken */
|
||||
|
||||
#ifdef CONFIG_NFSD_V3
|
||||
unsigned char fh_post_saved; /* post-op attrs saved */
|
||||
unsigned char fh_pre_saved; /* pre-op attrs saved */
|
||||
|
||||
/* Pre-op attributes saved during fh_lock */
|
||||
__u64 fh_pre_size; /* size before operation */
|
||||
struct timespec fh_pre_mtime; /* mtime before oper */
|
||||
struct timespec fh_pre_ctime; /* ctime before oper */
|
||||
/*
|
||||
* pre-op nfsv4 change attr: note must check IS_I_VERSION(inode)
|
||||
* to find out if it is valid.
|
||||
*/
|
||||
u64 fh_pre_change;
|
||||
|
||||
/* Post-op attributes saved in fh_unlock */
|
||||
struct kstat fh_post_attr; /* full attrs after operation */
|
||||
u64 fh_post_change; /* nfsv4 change; see above */
|
||||
#endif /* CONFIG_NFSD_V3 */
|
||||
|
||||
} svc_fh;
|
||||
|
||||
enum nfsd_fsid {
|
||||
FSID_DEV = 0,
|
||||
|
|
@ -215,4 +264,4 @@ fh_unlock(struct svc_fh *fhp)
|
|||
}
|
||||
}
|
||||
|
||||
#endif /* _LINUX_NFSD_FH_INT_H */
|
||||
#endif /* _LINUX_NFSD_NFSFH_H */
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
|
||||
#include <linux/idr.h>
|
||||
#include <linux/sunrpc/svc_xprt.h>
|
||||
#include <linux/nfsd/nfsfh.h>
|
||||
#include "nfsfh.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
#include <linux/fs.h>
|
||||
#include <linux/kref.h>
|
||||
#include <linux/utsname.h>
|
||||
#include <linux/nfsd/nfsfh.h>
|
||||
#include <linux/lockd/bind.h>
|
||||
#include <linux/lockd/xdr.h>
|
||||
#ifdef CONFIG_LOCKD_V4
|
||||
#include <linux/lockd/xdr4.h>
|
||||
#endif
|
||||
#include <linux/lockd/debug.h>
|
||||
#include <linux/sunrpc/svc.h>
|
||||
|
||||
/*
|
||||
* Version string
|
||||
|
|
|
|||
|
|
@ -9,9 +9,13 @@
|
|||
#ifndef NFSD_EXPORT_H
|
||||
#define NFSD_EXPORT_H
|
||||
|
||||
# include <linux/nfsd/nfsfh.h>
|
||||
#include <linux/sunrpc/cache.h>
|
||||
#include <uapi/linux/nfsd/export.h>
|
||||
|
||||
struct knfsd_fh;
|
||||
struct svc_fh;
|
||||
struct svc_rqst;
|
||||
|
||||
/*
|
||||
* FS Locations
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
/*
|
||||
* include/linux/nfsd/nfsfh.h
|
||||
*
|
||||
* This file describes the layout of the file handles as passed
|
||||
* over the wire.
|
||||
*
|
||||
* Earlier versions of knfsd used to sign file handles using keyed MD5
|
||||
* or SHA. I've removed this code, because it doesn't give you more
|
||||
* security than blocking external access to port 2049 on your firewall.
|
||||
*
|
||||
* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
|
||||
*/
|
||||
#ifndef _LINUX_NFSD_FH_H
|
||||
#define _LINUX_NFSD_FH_H
|
||||
|
||||
# include <linux/sunrpc/svc.h>
|
||||
#include <uapi/linux/nfsd/nfsfh.h>
|
||||
|
||||
static inline __u32 ino_t_to_u32(ino_t ino)
|
||||
{
|
||||
return (__u32) ino;
|
||||
}
|
||||
|
||||
static inline ino_t u32_to_ino_t(__u32 uino)
|
||||
{
|
||||
return (ino_t) uino;
|
||||
}
|
||||
|
||||
/*
|
||||
* This is the internal representation of an NFS handle used in knfsd.
|
||||
* pre_mtime/post_version will be used to support wcc_attr's in NFSv3.
|
||||
*/
|
||||
typedef struct svc_fh {
|
||||
struct knfsd_fh fh_handle; /* FH data */
|
||||
struct dentry * fh_dentry; /* validated dentry */
|
||||
struct svc_export * fh_export; /* export pointer */
|
||||
int fh_maxsize; /* max size for fh_handle */
|
||||
|
||||
unsigned char fh_locked; /* inode locked by us */
|
||||
unsigned char fh_want_write; /* remount protection taken */
|
||||
|
||||
#ifdef CONFIG_NFSD_V3
|
||||
unsigned char fh_post_saved; /* post-op attrs saved */
|
||||
unsigned char fh_pre_saved; /* pre-op attrs saved */
|
||||
|
||||
/* Pre-op attributes saved during fh_lock */
|
||||
__u64 fh_pre_size; /* size before operation */
|
||||
struct timespec fh_pre_mtime; /* mtime before oper */
|
||||
struct timespec fh_pre_ctime; /* ctime before oper */
|
||||
/*
|
||||
* pre-op nfsv4 change attr: note must check IS_I_VERSION(inode)
|
||||
* to find out if it is valid.
|
||||
*/
|
||||
u64 fh_pre_change;
|
||||
|
||||
/* Post-op attributes saved in fh_unlock */
|
||||
struct kstat fh_post_attr; /* full attrs after operation */
|
||||
u64 fh_post_change; /* nfsv4 change; see above */
|
||||
#endif /* CONFIG_NFSD_V3 */
|
||||
|
||||
} svc_fh;
|
||||
|
||||
#endif /* _LINUX_NFSD_FH_H */
|
||||
Loading…
Reference in New Issue