nfsd: make fs/nfsd/vfs.h for common includes
None of this stuff is used outside nfsd, so move it out of the common linux include directory. Actually, probably none of the stuff in include/linux/nfsd/nfsd.h really belongs there, so later we may remove that file entirely. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
parent
ea4878a24d
commit
0a3adadee4
|
@ -16,6 +16,7 @@
|
||||||
#include <linux/sunrpc/svc.h>
|
#include <linux/sunrpc/svc.h>
|
||||||
#include <linux/nfsd/nfsd.h>
|
#include <linux/nfsd/nfsd.h>
|
||||||
#include <linux/lockd/bind.h>
|
#include <linux/lockd/bind.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#define NFSDDBG_FACILITY NFSDDBG_LOCKD
|
#define NFSDDBG_FACILITY NFSDDBG_LOCKD
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include <linux/nfsd/xdr3.h>
|
#include <linux/nfsd/xdr3.h>
|
||||||
#include <linux/posix_acl.h>
|
#include <linux/posix_acl.h>
|
||||||
#include <linux/nfsacl.h>
|
#include <linux/nfsacl.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
||||||
#define RETURN_STATUS(st) { resp->status = (st); return (st); }
|
#define RETURN_STATUS(st) { resp->status = (st); return (st); }
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include <linux/nfsd/xdr3.h>
|
#include <linux/nfsd/xdr3.h>
|
||||||
#include <linux/posix_acl.h>
|
#include <linux/posix_acl.h>
|
||||||
#include <linux/nfsacl.h>
|
#include <linux/nfsacl.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#define RETURN_STATUS(st) { resp->status = (st); return (st); }
|
#define RETURN_STATUS(st) { resp->status = (st); return (st); }
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include <linux/nfsd/cache.h>
|
#include <linux/nfsd/cache.h>
|
||||||
#include <linux/nfsd/xdr3.h>
|
#include <linux/nfsd/xdr3.h>
|
||||||
#include <linux/nfs3.h>
|
#include <linux/nfs3.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,7 @@
|
||||||
#include <linux/nfsd/xdr4.h>
|
#include <linux/nfsd/xdr4.h>
|
||||||
#include <linux/nfs4_acl.h>
|
#include <linux/nfs4_acl.h>
|
||||||
#include <linux/sunrpc/gss_api.h>
|
#include <linux/sunrpc/gss_api.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
#include <linux/crypto.h>
|
#include <linux/crypto.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/mount.h>
|
#include <linux/mount.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
||||||
|
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/sunrpc/svcauth_gss.h>
|
#include <linux/sunrpc/svcauth_gss.h>
|
||||||
#include <linux/sunrpc/clnt.h>
|
#include <linux/sunrpc/clnt.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
#define NFSDDBG_FACILITY NFSDDBG_PROC
|
||||||
|
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
#include <linux/nfs4_acl.h>
|
#include <linux/nfs4_acl.h>
|
||||||
#include <linux/sunrpc/gss_api.h>
|
#include <linux/sunrpc/gss_api.h>
|
||||||
#include <linux/sunrpc/svcauth_gss.h>
|
#include <linux/sunrpc/svcauth_gss.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#define NFSDDBG_FACILITY NFSDDBG_XDR
|
#define NFSDDBG_FACILITY NFSDDBG_XDR
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include <linux/sunrpc/svc.h>
|
#include <linux/sunrpc/svc.h>
|
||||||
#include <linux/sunrpc/svcauth_gss.h>
|
#include <linux/sunrpc/svcauth_gss.h>
|
||||||
#include <linux/nfsd/nfsd.h>
|
#include <linux/nfsd/nfsd.h>
|
||||||
|
#include "vfs.h"
|
||||||
#include "auth.h"
|
#include "auth.h"
|
||||||
|
|
||||||
#define NFSDDBG_FACILITY NFSDDBG_FH
|
#define NFSDDBG_FACILITY NFSDDBG_FH
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <linux/nfsd/nfsd.h>
|
#include <linux/nfsd/nfsd.h>
|
||||||
#include <linux/nfsd/cache.h>
|
#include <linux/nfsd/cache.h>
|
||||||
#include <linux/nfsd/xdr.h>
|
#include <linux/nfsd/xdr.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
typedef struct svc_rqst svc_rqst;
|
typedef struct svc_rqst svc_rqst;
|
||||||
typedef struct svc_buf svc_buf;
|
typedef struct svc_buf svc_buf;
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
#include <linux/lockd/bind.h>
|
#include <linux/lockd/bind.h>
|
||||||
#include <linux/nfsacl.h>
|
#include <linux/nfsacl.h>
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#define NFSDDBG_FACILITY NFSDDBG_SVC
|
#define NFSDDBG_FACILITY NFSDDBG_SVC
|
||||||
|
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
#endif /* CONFIG_NFSD_V4 */
|
#endif /* CONFIG_NFSD_V4 */
|
||||||
#include <linux/jhash.h>
|
#include <linux/jhash.h>
|
||||||
#include <linux/ima.h>
|
#include <linux/ima.h>
|
||||||
|
#include "vfs.h"
|
||||||
|
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,98 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef LINUX_NFSD_VFS_H
|
||||||
|
#define LINUX_NFSD_VFS_H
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Flags for nfsd_permission
|
||||||
|
*/
|
||||||
|
#define NFSD_MAY_NOP 0
|
||||||
|
#define NFSD_MAY_EXEC 1 /* == MAY_EXEC */
|
||||||
|
#define NFSD_MAY_WRITE 2 /* == MAY_WRITE */
|
||||||
|
#define NFSD_MAY_READ 4 /* == MAY_READ */
|
||||||
|
#define NFSD_MAY_SATTR 8
|
||||||
|
#define NFSD_MAY_TRUNC 16
|
||||||
|
#define NFSD_MAY_LOCK 32
|
||||||
|
#define NFSD_MAY_OWNER_OVERRIDE 64
|
||||||
|
#define NFSD_MAY_LOCAL_ACCESS 128 /* IRIX doing local access check on device special file*/
|
||||||
|
#define NFSD_MAY_BYPASS_GSS_ON_ROOT 256
|
||||||
|
|
||||||
|
#define NFSD_MAY_CREATE (NFSD_MAY_EXEC|NFSD_MAY_WRITE)
|
||||||
|
#define NFSD_MAY_REMOVE (NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Callback function for readdir
|
||||||
|
*/
|
||||||
|
typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
|
||||||
|
|
||||||
|
/* nfsd/vfs.c */
|
||||||
|
int fh_lock_parent(struct svc_fh *, struct dentry *);
|
||||||
|
int nfsd_racache_init(int);
|
||||||
|
void nfsd_racache_shutdown(void);
|
||||||
|
int nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
|
||||||
|
struct svc_export **expp);
|
||||||
|
__be32 nfsd_lookup(struct svc_rqst *, struct svc_fh *,
|
||||||
|
const char *, unsigned int, struct svc_fh *);
|
||||||
|
__be32 nfsd_lookup_dentry(struct svc_rqst *, struct svc_fh *,
|
||||||
|
const char *, unsigned int,
|
||||||
|
struct svc_export **, struct dentry **);
|
||||||
|
__be32 nfsd_setattr(struct svc_rqst *, struct svc_fh *,
|
||||||
|
struct iattr *, int, time_t);
|
||||||
|
#ifdef CONFIG_NFSD_V4
|
||||||
|
__be32 nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
|
||||||
|
struct nfs4_acl *);
|
||||||
|
int nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **);
|
||||||
|
#endif /* CONFIG_NFSD_V4 */
|
||||||
|
__be32 nfsd_create(struct svc_rqst *, struct svc_fh *,
|
||||||
|
char *name, int len, struct iattr *attrs,
|
||||||
|
int type, dev_t rdev, struct svc_fh *res);
|
||||||
|
#ifdef CONFIG_NFSD_V3
|
||||||
|
__be32 nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *);
|
||||||
|
__be32 nfsd_create_v3(struct svc_rqst *, struct svc_fh *,
|
||||||
|
char *name, int len, struct iattr *attrs,
|
||||||
|
struct svc_fh *res, int createmode,
|
||||||
|
u32 *verifier, int *truncp, int *created);
|
||||||
|
__be32 nfsd_commit(struct svc_rqst *, struct svc_fh *,
|
||||||
|
loff_t, unsigned long);
|
||||||
|
#endif /* CONFIG_NFSD_V3 */
|
||||||
|
__be32 nfsd_open(struct svc_rqst *, struct svc_fh *, int,
|
||||||
|
int, struct file **);
|
||||||
|
void nfsd_close(struct file *);
|
||||||
|
__be32 nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *,
|
||||||
|
loff_t, struct kvec *, int, unsigned long *);
|
||||||
|
__be32 nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,
|
||||||
|
loff_t, struct kvec *,int, unsigned long *, int *);
|
||||||
|
__be32 nfsd_readlink(struct svc_rqst *, struct svc_fh *,
|
||||||
|
char *, int *);
|
||||||
|
__be32 nfsd_symlink(struct svc_rqst *, struct svc_fh *,
|
||||||
|
char *name, int len, char *path, int plen,
|
||||||
|
struct svc_fh *res, struct iattr *);
|
||||||
|
__be32 nfsd_link(struct svc_rqst *, struct svc_fh *,
|
||||||
|
char *, int, struct svc_fh *);
|
||||||
|
__be32 nfsd_rename(struct svc_rqst *,
|
||||||
|
struct svc_fh *, char *, int,
|
||||||
|
struct svc_fh *, char *, int);
|
||||||
|
__be32 nfsd_remove(struct svc_rqst *,
|
||||||
|
struct svc_fh *, char *, int);
|
||||||
|
__be32 nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type,
|
||||||
|
char *name, int len);
|
||||||
|
int nfsd_truncate(struct svc_rqst *, struct svc_fh *,
|
||||||
|
unsigned long size);
|
||||||
|
__be32 nfsd_readdir(struct svc_rqst *, struct svc_fh *,
|
||||||
|
loff_t *, struct readdir_cd *, filldir_t);
|
||||||
|
__be32 nfsd_statfs(struct svc_rqst *, struct svc_fh *,
|
||||||
|
struct kstatfs *, int access);
|
||||||
|
|
||||||
|
int nfsd_notify_change(struct inode *, struct iattr *);
|
||||||
|
__be32 nfsd_permission(struct svc_rqst *, struct svc_export *,
|
||||||
|
struct dentry *, int);
|
||||||
|
int nfsd_sync_dir(struct dentry *dp);
|
||||||
|
|
||||||
|
#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
|
||||||
|
struct posix_acl *nfsd_get_posix_acl(struct svc_fh *, int);
|
||||||
|
int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* LINUX_NFSD_VFS_H */
|
|
@ -25,30 +25,10 @@
|
||||||
*/
|
*/
|
||||||
#define NFSD_SUPPORTED_MINOR_VERSION 1
|
#define NFSD_SUPPORTED_MINOR_VERSION 1
|
||||||
|
|
||||||
/*
|
|
||||||
* Flags for nfsd_permission
|
|
||||||
*/
|
|
||||||
#define NFSD_MAY_NOP 0
|
|
||||||
#define NFSD_MAY_EXEC 1 /* == MAY_EXEC */
|
|
||||||
#define NFSD_MAY_WRITE 2 /* == MAY_WRITE */
|
|
||||||
#define NFSD_MAY_READ 4 /* == MAY_READ */
|
|
||||||
#define NFSD_MAY_SATTR 8
|
|
||||||
#define NFSD_MAY_TRUNC 16
|
|
||||||
#define NFSD_MAY_LOCK 32
|
|
||||||
#define NFSD_MAY_OWNER_OVERRIDE 64
|
|
||||||
#define NFSD_MAY_LOCAL_ACCESS 128 /* IRIX doing local access check on device special file*/
|
|
||||||
#define NFSD_MAY_BYPASS_GSS_ON_ROOT 256
|
|
||||||
|
|
||||||
#define NFSD_MAY_CREATE (NFSD_MAY_EXEC|NFSD_MAY_WRITE)
|
|
||||||
#define NFSD_MAY_REMOVE (NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Callback function for readdir
|
|
||||||
*/
|
|
||||||
struct readdir_cd {
|
struct readdir_cd {
|
||||||
__be32 err; /* 0, nfserr, or nfserr_eof */
|
__be32 err; /* 0, nfserr, or nfserr_eof */
|
||||||
};
|
};
|
||||||
typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
|
|
||||||
|
|
||||||
extern struct svc_program nfsd_program;
|
extern struct svc_program nfsd_program;
|
||||||
extern struct svc_version nfsd_version2, nfsd_version3,
|
extern struct svc_version nfsd_version2, nfsd_version3,
|
||||||
|
@ -73,69 +53,6 @@ int nfsd_nrpools(void);
|
||||||
int nfsd_get_nrthreads(int n, int *);
|
int nfsd_get_nrthreads(int n, int *);
|
||||||
int nfsd_set_nrthreads(int n, int *);
|
int nfsd_set_nrthreads(int n, int *);
|
||||||
|
|
||||||
/* nfsd/vfs.c */
|
|
||||||
int fh_lock_parent(struct svc_fh *, struct dentry *);
|
|
||||||
int nfsd_racache_init(int);
|
|
||||||
void nfsd_racache_shutdown(void);
|
|
||||||
int nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
|
|
||||||
struct svc_export **expp);
|
|
||||||
__be32 nfsd_lookup(struct svc_rqst *, struct svc_fh *,
|
|
||||||
const char *, unsigned int, struct svc_fh *);
|
|
||||||
__be32 nfsd_lookup_dentry(struct svc_rqst *, struct svc_fh *,
|
|
||||||
const char *, unsigned int,
|
|
||||||
struct svc_export **, struct dentry **);
|
|
||||||
__be32 nfsd_setattr(struct svc_rqst *, struct svc_fh *,
|
|
||||||
struct iattr *, int, time_t);
|
|
||||||
#ifdef CONFIG_NFSD_V4
|
|
||||||
__be32 nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
|
|
||||||
struct nfs4_acl *);
|
|
||||||
int nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **);
|
|
||||||
#endif /* CONFIG_NFSD_V4 */
|
|
||||||
__be32 nfsd_create(struct svc_rqst *, struct svc_fh *,
|
|
||||||
char *name, int len, struct iattr *attrs,
|
|
||||||
int type, dev_t rdev, struct svc_fh *res);
|
|
||||||
#ifdef CONFIG_NFSD_V3
|
|
||||||
__be32 nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *);
|
|
||||||
__be32 nfsd_create_v3(struct svc_rqst *, struct svc_fh *,
|
|
||||||
char *name, int len, struct iattr *attrs,
|
|
||||||
struct svc_fh *res, int createmode,
|
|
||||||
u32 *verifier, int *truncp, int *created);
|
|
||||||
__be32 nfsd_commit(struct svc_rqst *, struct svc_fh *,
|
|
||||||
loff_t, unsigned long);
|
|
||||||
#endif /* CONFIG_NFSD_V3 */
|
|
||||||
__be32 nfsd_open(struct svc_rqst *, struct svc_fh *, int,
|
|
||||||
int, struct file **);
|
|
||||||
void nfsd_close(struct file *);
|
|
||||||
__be32 nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *,
|
|
||||||
loff_t, struct kvec *, int, unsigned long *);
|
|
||||||
__be32 nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,
|
|
||||||
loff_t, struct kvec *,int, unsigned long *, int *);
|
|
||||||
__be32 nfsd_readlink(struct svc_rqst *, struct svc_fh *,
|
|
||||||
char *, int *);
|
|
||||||
__be32 nfsd_symlink(struct svc_rqst *, struct svc_fh *,
|
|
||||||
char *name, int len, char *path, int plen,
|
|
||||||
struct svc_fh *res, struct iattr *);
|
|
||||||
__be32 nfsd_link(struct svc_rqst *, struct svc_fh *,
|
|
||||||
char *, int, struct svc_fh *);
|
|
||||||
__be32 nfsd_rename(struct svc_rqst *,
|
|
||||||
struct svc_fh *, char *, int,
|
|
||||||
struct svc_fh *, char *, int);
|
|
||||||
__be32 nfsd_remove(struct svc_rqst *,
|
|
||||||
struct svc_fh *, char *, int);
|
|
||||||
__be32 nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type,
|
|
||||||
char *name, int len);
|
|
||||||
int nfsd_truncate(struct svc_rqst *, struct svc_fh *,
|
|
||||||
unsigned long size);
|
|
||||||
__be32 nfsd_readdir(struct svc_rqst *, struct svc_fh *,
|
|
||||||
loff_t *, struct readdir_cd *, filldir_t);
|
|
||||||
__be32 nfsd_statfs(struct svc_rqst *, struct svc_fh *,
|
|
||||||
struct kstatfs *, int access);
|
|
||||||
|
|
||||||
int nfsd_notify_change(struct inode *, struct iattr *);
|
|
||||||
__be32 nfsd_permission(struct svc_rqst *, struct svc_export *,
|
|
||||||
struct dentry *, int);
|
|
||||||
int nfsd_sync_dir(struct dentry *dp);
|
|
||||||
|
|
||||||
#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
|
#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
|
||||||
#ifdef CONFIG_NFSD_V2_ACL
|
#ifdef CONFIG_NFSD_V2_ACL
|
||||||
extern struct svc_version nfsd_acl_version2;
|
extern struct svc_version nfsd_acl_version2;
|
||||||
|
@ -147,8 +64,6 @@ extern struct svc_version nfsd_acl_version3;
|
||||||
#else
|
#else
|
||||||
#define nfsd_acl_version3 NULL
|
#define nfsd_acl_version3 NULL
|
||||||
#endif
|
#endif
|
||||||
struct posix_acl *nfsd_get_posix_acl(struct svc_fh *, int);
|
|
||||||
int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
|
enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
|
||||||
|
|
Loading…
Reference in New Issue