Commit dcd21270 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] PATCH - Create "export_operations" interface for filesystems to describe

Create "export_operations" interface for filesystems to describe
whether and how they should be exported.

- add new field in struct super_block "s_export_op" to describe
  how a filesystem is exported (i.e. how filehandles are mapped to
  dentries).
- New module: fs/exportfs for holding helper code for mapping between
  filehandles and dentries
- Change nfsd to use new interface if it exists.
- Change ext2 to provide new interface
- Add documention to filesystems/Exporting

If s_export_op isn't set, old mechanism still works, but it is
planned to remove old method and only use s_export_op.
parent 0de4fa30
...@@ -86,8 +86,7 @@ Filesystem Issues ...@@ -86,8 +86,7 @@ Filesystem Issues
For a filesystem to be exportable it must: For a filesystem to be exportable it must:
1/ provide the filehandle fragment routines described below 1/ provide the filehandle fragment routines described below.
(later).
2/ make sure that d_splice_alias is used rather than d_add 2/ make sure that d_splice_alias is used rather than d_add
when ->lookup finds an inode for a given parent and name. when ->lookup finds an inode for a given parent and name.
Typically the ->lookup routine will end: Typically the ->lookup routine will end:
...@@ -98,3 +97,80 @@ For a filesystem to be exportable it must: ...@@ -98,3 +97,80 @@ For a filesystem to be exportable it must:
} }
A file system implementation declares that instances of the filesystem
are exportable by setting the s_export_op field in the struct
super_block. This field must point to a "struct export_operations"
struct which could potentially be full of NULLs, though normally at
least get_parent will be set.
The primary operations are decode_fh and encode_fh.
decode_fh takes a filehandle fragment and tries to find or create a
dentry for the object referred to by the filehandle.
encode_fh takes a dentry and creates a filehandle fragment which can
later be used to find/create a dentry for the same object.
decode_fh will probably make use of "find_exported_dentry".
This function lives in the "exportfs" module which a filesystem does
not need unless it is being exported. So rather that calling
find_exported_dentry directly, each filesystem should call it through
the find_exported_dentry pointer in it's export_operations table.
This field is set correctly by the exporting agent (e.g. nfsd) when a
filesystem is exported, and before any export operations are called.
find_exported_dentry needs three support functions from the
filesystem:
get_name. When given a parent dentry and a child dentry, this
should find a name in the directory identified by the parent
dentry, which leads to the object identified by the child dentry.
If no get_name function is supplied, a default implementation
which used vfs_readdir to find potential names, and matches inode
numbers to find the correct match.
get_parent. When given a dentry for a directory, this should return
a dentry for the parent. Quite possibly the parent dentry will
have been allocated by d_alloc_anon.
The default get_parent function just returns an error so any
filehandle lookup that requires finding a parent will fail.
->lookup("..") is *not* used as a default as it can leave ".."
entries in the dcache which are too messy to work with.
get_dentry. When given a opaque datum, this should find the
implied object and create a dentry for it (possibly with
d_alloc_anon).
The opaque datum is whatever is passed down by the decode_fh
function, and is often simply a fragment of the filehandle
fragment.
decode_fh passes two datums through find_exported_dentry. One that
should be used to identify the target object, and one that can be
used to identify the objects parent, should that be necessary.
The default get_dentry function assumes that the datum contains an
inode number and a generation number, and it attempts to get the
inode using "iget" and check it's validity by matching the
generation number. A filesystem should only depend on the default
if iget can safely be used this way.
If decode_fh and/or encode_fh are left as NULL, then default
implementations are used. These defaults are suitable for ext2 and
extremely similar filesystems (like ext3).
The default encode_fh creates a filehandle fragment from the inode
number and generation number of the target together with the inode
number and generation number of the parent (if the parent is
required).
The default decode_fh extract the target and parent datums from the
filehandle assuming the format used by the default encode_fh and
passed them to find_exported_dentry.
A filehandle fragment consists of an array of 1 or more 4byte words.
Together with a one byte "type".
The decode_fh routine should not depend on the stated size that is
passed to it. This size may be larger than the original filehandle
generated by encode_fh, in which case it will have been padded with
nuls. Rather, the encode_fh routine should choose a "type" which
indicates the decode_fh how much of the filehandle is valid, and how
it should be interpreted.
Changes since 2.5.0: Changes since 2.5.0:
--- ---
[recommeneded] [recommended]
New helpers: sb_bread(), sb_getblk(), sb_get_hash_table(), set_bh(), New helpers: sb_bread(), sb_getblk(), sb_get_hash_table(), set_bh(),
sb_set_blocksize() and sb_min_blocksize(). sb_set_blocksize() and sb_min_blocksize().
...@@ -9,7 +9,7 @@ New helpers: sb_bread(), sb_getblk(), sb_get_hash_table(), set_bh(), ...@@ -9,7 +9,7 @@ New helpers: sb_bread(), sb_getblk(), sb_get_hash_table(), set_bh(),
Use them. Use them.
--- ---
[recommeneded] [recommended]
New methods: ->alloc_inode() and ->destroy_inode(). New methods: ->alloc_inode() and ->destroy_inode().
...@@ -123,3 +123,19 @@ went in - and hadn't been documented ;-/). Just remove it from fs_flags ...@@ -123,3 +123,19 @@ went in - and hadn't been documented ;-/). Just remove it from fs_flags
->setattr() is called without BKL now. Caller _always_ holds ->i_sem, so ->setattr() is called without BKL now. Caller _always_ holds ->i_sem, so
watch for ->i_sem-grabbing code that might be used by your ->setattr(). watch for ->i_sem-grabbing code that might be used by your ->setattr().
Callers of notify_change() need ->i_sem now. Callers of notify_change() need ->i_sem now.
---
[recommended]
New super_block field "struct export_operations *s_export_op" for
explicit support for exporting, e.g. via NFS. The structure is fully
documented at its declaration in include/linux/fs.h, and in
Documentation/filesystems/Exporting.
Briefly it allows for the definition of decode_fh and encode_fh operations
to encode and decode filehandles, and allows the filesystem to use
a standard helper function for decode_fh, and provide file-system specific
support for this helper, particularly get_parent.
It is planned that this will be required for exporting once the code
settles down a bit.
...@@ -124,6 +124,7 @@ if [ "$CONFIG_NET" = "y" ]; then ...@@ -124,6 +124,7 @@ if [ "$CONFIG_NET" = "y" ]; then
if [ "$CONFIG_NFSD_V3" = "y" -o "$CONFIG_NFS_V3" = "y" ]; then if [ "$CONFIG_NFSD_V3" = "y" -o "$CONFIG_NFS_V3" = "y" ]; then
define_bool CONFIG_LOCKD_V4 y define_bool CONFIG_LOCKD_V4 y
fi fi
define_tristate CONFIG_EXPORTFS $CONFIG_NFSD
dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET
if [ "$CONFIG_SMB_FS" != "n" ]; then if [ "$CONFIG_SMB_FS" != "n" ]; then
......
...@@ -45,6 +45,7 @@ subdir-$(CONFIG_DEVFS_FS) += devfs ...@@ -45,6 +45,7 @@ subdir-$(CONFIG_DEVFS_FS) += devfs
subdir-$(CONFIG_HFS_FS) += hfs subdir-$(CONFIG_HFS_FS) += hfs
subdir-$(CONFIG_VXFS_FS) += freevxfs subdir-$(CONFIG_VXFS_FS) += freevxfs
subdir-$(CONFIG_NFS_FS) += nfs subdir-$(CONFIG_NFS_FS) += nfs
subdir-$(CONFIG_EXPORTFS) += exportfs
subdir-$(CONFIG_NFSD) += nfsd subdir-$(CONFIG_NFSD) += nfsd
subdir-$(CONFIG_LOCKD) += lockd subdir-$(CONFIG_LOCKD) += lockd
subdir-$(CONFIG_NLS) += nls subdir-$(CONFIG_NLS) += nls
......
#
# Makefile for the filesystem export support routines.
O_TARGET := exportfs.o
export-objs := expfs.o
obj-y := expfs.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make
This diff is collapsed.
...@@ -79,10 +79,37 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry) ...@@ -79,10 +79,37 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry)
if (!inode) if (!inode)
return ERR_PTR(-EACCES); return ERR_PTR(-EACCES);
} }
if (inode)
return d_splice_alias(inode, dentry);
d_add(dentry, inode); d_add(dentry, inode);
return NULL; return NULL;
} }
struct dentry *ext2_get_parent(struct dentry *child)
{
unsigned long ino;
struct dentry *parent;
struct inode *inode;
struct dentry dotdot;
dotdot.d_name.name = "..";
dotdot.d_name.len = 2;
ino = ext2_inode_by_name(child->d_inode, &dotdot);
if (!ino)
return ERR_PTR(-ENOENT);
inode = iget(child->d_inode->i_sb, ino);
if (!inode)
return ERR_PTR(-EACCES);
parent = d_alloc_anon(inode);
if (!parent) {
iput(inode);
parent = ERR_PTR(-ENOMEM);
}
return parent;
}
/* /*
* By the time this is called, we already have created * By the time this is called, we already have created
* the directory cache entry for the new file, but it * the directory cache entry for the new file, but it
......
...@@ -209,6 +209,16 @@ static struct super_operations ext2_sops = { ...@@ -209,6 +209,16 @@ static struct super_operations ext2_sops = {
remount_fs: ext2_remount, remount_fs: ext2_remount,
}; };
/* Yes, most of these are left as NULL!!
* A NULL value implies the default, which works with ext2-like file
* systems, but can be improved upon.
* Currently only get_parent is required.
*/
struct dentry *ext2_get_parent(struct dentry *child);
static struct export_operations ext2_export_ops = {
get_parent: ext2_get_parent,
};
/* /*
* This function has been shamelessly adapted from the msdos fs * This function has been shamelessly adapted from the msdos fs
*/ */
...@@ -687,6 +697,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) ...@@ -687,6 +697,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
* set up enough so that it can read an inode * set up enough so that it can read an inode
*/ */
sb->s_op = &ext2_sops; sb->s_op = &ext2_sops;
sb->s_export_op = &ext2_export_ops;
sb->s_root = d_alloc_root(iget(sb, EXT2_ROOT_INO)); sb->s_root = d_alloc_root(iget(sb, EXT2_ROOT_INO));
if (!sb->s_root || !S_ISDIR(sb->s_root->d_inode->i_mode) || if (!sb->s_root || !S_ISDIR(sb->s_root->d_inode->i_mode) ||
!sb->s_root->d_inode->i_blocks || !sb->s_root->d_inode->i_size) { !sb->s_root->d_inode->i_blocks || !sb->s_root->d_inode->i_size) {
......
...@@ -233,6 +233,10 @@ static void exp_fsid_hash(struct svc_client *clp, struct svc_export *exp) ...@@ -233,6 +233,10 @@ static void exp_fsid_hash(struct svc_client *clp, struct svc_export *exp)
list_add(&exp->ex_fsid_hash, head); list_add(&exp->ex_fsid_hash, head);
} }
extern struct dentry *
find_exported_dentry(struct super_block *sb, void *obj, void *parent,
int (*acceptable)(void *context, struct dentry *de),
void *context);
/* /*
* Export a file system. * Export a file system.
*/ */
...@@ -316,12 +320,17 @@ exp_export(struct nfsctl_export *nxp) ...@@ -316,12 +320,17 @@ exp_export(struct nfsctl_export *nxp)
|| (nxp->ex_flags & NFSEXP_FSID)) || (nxp->ex_flags & NFSEXP_FSID))
&& &&
(inode->i_sb->s_op->read_inode (inode->i_sb->s_op->read_inode
|| inode->i_sb->s_export_op
|| inode->i_sb->s_op->fh_to_dentry)) || inode->i_sb->s_op->fh_to_dentry))
/* Ok, we can export it */; /* Ok, we can export it */;
else { else {
dprintk("exp_export: export of invalid fs type.\n"); dprintk("exp_export: export of invalid fs type.\n");
goto finish; goto finish;
} }
if (inode->i_sb->s_export_op &&
!inode->i_sb->s_export_op->find_exported_dentry)
inode->i_sb->s_export_op->find_exported_dentry =
find_exported_dentry;
if ((parent = exp_child(clp, inode->i_sb, nd.dentry)) != NULL) { if ((parent = exp_child(clp, inode->i_sb, nd.dentry)) != NULL) {
dprintk("exp_export: export not valid (Rule 3).\n"); dprintk("exp_export: export not valid (Rule 3).\n");
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/nfsd/cache.h> #include <linux/nfsd/cache.h>
#include <linux/nfsd/xdr.h> #include <linux/nfsd/xdr.h>
#include <linux/nfsd/syscall.h> #include <linux/nfsd/syscall.h>
#include <linux/nfsd/interface.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -379,6 +380,7 @@ static struct file_system_type nfsd_fs_type = { ...@@ -379,6 +380,7 @@ static struct file_system_type nfsd_fs_type = {
static int __init init_nfsd(void) static int __init init_nfsd(void)
{ {
printk(KERN_INFO "Installing knfsd (copyright (C) 1996 okir@monad.swb.de).\n"); printk(KERN_INFO "Installing knfsd (copyright (C) 1996 okir@monad.swb.de).\n");
nfsd_stat_init(); /* Statistics */ nfsd_stat_init(); /* Statistics */
nfsd_cache_init(); /* RPC reply cache */ nfsd_cache_init(); /* RPC reply cache */
nfsd_export_init(); /* Exports table */ nfsd_export_init(); /* Exports table */
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
* Portions Copyright (C) 1999 G. Allen Morris III <gam3@acm.org> * Portions Copyright (C) 1999 G. Allen Morris III <gam3@acm.org>
* Extensive rewrite by Neil Brown <neilb@cse.unsw.edu.au> Southern-Spring 1999 * Extensive rewrite by Neil Brown <neilb@cse.unsw.edu.au> Southern-Spring 1999
* ... and again Southern-Winter 2001 to support export_operations
*/ */
#include <linux/sched.h> #include <linux/sched.h>
...@@ -29,6 +30,11 @@ ...@@ -29,6 +30,11 @@
static int nfsd_nr_verified; static int nfsd_nr_verified;
static int nfsd_nr_put; static int nfsd_nr_put;
extern struct export_operations export_op_default;
#define CALL(ops,fun) ((ops->fun)?(ops->fun):export_op_default.fun)
struct nfsd_getdents_callback { struct nfsd_getdents_callback {
char *name; /* name that was found. It already points to a buffer NAME_MAX+1 is size */ char *name; /* name that was found. It already points to a buffer NAME_MAX+1 is size */
...@@ -60,15 +66,6 @@ dprintk("filldir_one: seq=%d, ino=%ld, name=%s\n", buf->sequence, ino, name); ...@@ -60,15 +66,6 @@ dprintk("filldir_one: seq=%d, ino=%ld, name=%s\n", buf->sequence, ino, name);
return result; return result;
} }
/**
* nfsd_get_name - default nfsd_operations->get_name function
* @dentry: the directory in which to find a name
* @name: a pointer to a %NAME_MAX+1 char buffer to store the name
* @child: the dentry for the child directory.
*
* calls readdir on the parent until it finds an entry with
* the same inode number as the child, and returns that.
*/
static int nfsd_get_name(struct dentry *dentry, char *name, static int nfsd_get_name(struct dentry *dentry, char *name,
struct dentry *child) struct dentry *child)
{ {
...@@ -120,9 +117,6 @@ static int nfsd_get_name(struct dentry *dentry, char *name, ...@@ -120,9 +117,6 @@ static int nfsd_get_name(struct dentry *dentry, char *name,
return error; return error;
} }
/* this should be provided by each filesystem in an nfsd_operations interface as
* iget isn't really the right interface
*/
static struct dentry *nfsd_iget(struct super_block *sb, unsigned long ino, __u32 generation) static struct dentry *nfsd_iget(struct super_block *sb, unsigned long ino, __u32 generation)
{ {
...@@ -244,7 +238,6 @@ int d_splice(struct dentry *target, struct dentry *parent, struct qstr *name) ...@@ -244,7 +238,6 @@ int d_splice(struct dentry *target, struct dentry *parent, struct qstr *name)
} }
/* this routine finds the dentry of the parent of a given directory /* this routine finds the dentry of the parent of a given directory
* it should be in the filesystem accessed by nfsd_operations
* it assumes lookup("..") works. * it assumes lookup("..") works.
*/ */
struct dentry *nfsd_findparent(struct dentry *child) struct dentry *nfsd_findparent(struct dentry *child)
...@@ -509,6 +502,46 @@ find_fh_dentry(struct super_block *sb, __u32 *datap, int len, int fhtype, int ne ...@@ -509,6 +502,46 @@ find_fh_dentry(struct super_block *sb, __u32 *datap, int len, int fhtype, int ne
return ERR_PTR(err); return ERR_PTR(err);
} }
/*
* our acceptability function.
* if NOSUBTREECHECK, accept anything
* if not, require that we can walk up to exp->ex_dentry
* doing some checks on the 'x' bits
*/
int nfsd_acceptable(void *expv, struct dentry *dentry)
{
struct svc_export *exp = expv;
int rv;
struct dentry *tdentry;
if (exp->ex_flags & NFSEXP_NOSUBTREECHECK)
return 1;
dget(dentry);
read_lock(&dparent_lock);
for (tdentry = dentry;
tdentry != exp->ex_dentry && ! IS_ROOT(tdentry);
(dget(tdentry->d_parent),
dput(tdentry),
tdentry = tdentry->d_parent)
) {
/* make sure parents give x permission to user */
int err;
read_unlock(&dparent_lock);
err = permission(tdentry->d_parent->d_inode, S_IXOTH);
read_lock(&dparent_lock);
if (err < 0)
break;
}
read_unlock(&dparent_lock);
if (tdentry != exp->ex_dentry)
dprintk("nfsd_acceptable failed at %p %s\n", tdentry, tdentry->d_name.name);
rv = (tdentry == exp->ex_dentry);
dput(tdentry);
return rv;
}
/* /*
* Perform sanity checks on the dentry in a client's file handle. * Perform sanity checks on the dentry in a client's file handle.
* *
...@@ -536,6 +569,8 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) ...@@ -536,6 +569,8 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
kdev_t xdev = NODEV; kdev_t xdev = NODEV;
ino_t xino = 0; ino_t xino = 0;
__u32 *datap=NULL; __u32 *datap=NULL;
__u32 tfh[3]; /* filehandle fragment for oldstyle filehandles */
int fileid_type;
int data_left = fh->fh_size/4; int data_left = fh->fh_size/4;
int nfsdev; int nfsdev;
int fsid = 0; int fsid = 0;
...@@ -543,8 +578,8 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) ...@@ -543,8 +578,8 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
error = nfserr_stale; error = nfserr_stale;
if (rqstp->rq_vers == 3) if (rqstp->rq_vers == 3)
error = nfserr_badhandle; error = nfserr_badhandle;
if (fh->fh_version == 1) { if (fh->fh_version == 1) {
datap = fh->fh_auth; datap = fh->fh_auth;
if (--data_left<0) goto out; if (--data_left<0) goto out;
switch (fh->fh_auth_type) { switch (fh->fh_auth_type) {
...@@ -585,7 +620,6 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) ...@@ -585,7 +620,6 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
if (!exp) { if (!exp) {
/* export entry revoked */ /* export entry revoked */
nfsdstats.fh_stale++;
goto out; goto out;
} }
...@@ -609,27 +643,35 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) ...@@ -609,27 +643,35 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
if (rqstp->rq_vers == 3) if (rqstp->rq_vers == 3)
error = nfserr_badhandle; error = nfserr_badhandle;
if (fh->fh_version == 1) { if (fh->fh_version != 1) {
/* if fileid_type != 0, and super_operations provide fh_to_dentry lookup,
* then should use that */
switch (fh->fh_fileid_type) {
case 0:
dentry = dget(exp->ex_dentry);
break;
default:
dentry = find_fh_dentry(exp->ex_dentry->d_sb,
datap, data_left, fh->fh_fileid_type,
!(exp->ex_flags & NFSEXP_NOSUBTREECHECK));
}
} else {
__u32 tfh[3];
tfh[0] = fh->ofh_ino; tfh[0] = fh->ofh_ino;
tfh[1] = fh->ofh_generation; tfh[1] = fh->ofh_generation;
tfh[2] = fh->ofh_dirino; tfh[2] = fh->ofh_dirino;
dentry = find_fh_dentry(exp->ex_dentry->d_sb, datap = tfh;
tfh, 3, fh->ofh_dirino?2:1, data_left = 3;
!(exp->ex_flags & NFSEXP_NOSUBTREECHECK)); if (fh->ofh_dirino == 0)
fileid_type = 1;
else
fileid_type = 2;
} else
fileid_type = fh->fh_fileid_type;
if (fileid_type == 0)
dentry = dget(exp->ex_dentry);
else {
struct export_operations *nop = exp->ex_mnt->mnt_sb->s_export_op;
if (nop)
dentry = CALL(nop,decode_fh)(exp->ex_mnt->mnt_sb,
datap, data_left,
fileid_type,
nfsd_acceptable, exp);
else
dentry = find_fh_dentry(exp->ex_dentry->d_sb,
datap, data_left, fileid_type,
!(exp->ex_flags & NFSEXP_NOSUBTREECHECK));
} }
if (dentry == NULL)
goto out;
if (IS_ERR(dentry)) { if (IS_ERR(dentry)) {
if (PTR_ERR(dentry) != -EINVAL) if (PTR_ERR(dentry) != -EINVAL)
error = nfserrno(PTR_ERR(dentry)); error = nfserrno(PTR_ERR(dentry));
...@@ -664,7 +706,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) ...@@ -664,7 +706,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
* write call). * write call).
*/ */
/* When is type ever negative? */ /* Type can be negative when creating hardlinks - not to a dir */
if (type > 0 && (inode->i_mode & S_IFMT) != type) { if (type > 0 && (inode->i_mode & S_IFMT) != type) {
error = (type == S_IFDIR)? nfserr_notdir : nfserr_isdir; error = (type == S_IFDIR)? nfserr_notdir : nfserr_isdir;
goto out; goto out;
...@@ -676,10 +718,14 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) ...@@ -676,10 +718,14 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
/* /*
* Security: Check that the export is valid for dentry <gam3@acm.org> * Security: Check that the export is valid for dentry <gam3@acm.org>
* This is only needed with subtree_check, and if export_operations is
* not being used - export_operations does the check via the "acceptable"
* callback
*/ */
error = 0; error = 0;
if (!(exp->ex_flags & NFSEXP_NOSUBTREECHECK)) { if (exp->ex_mnt->mnt_sb->s_export_op == NULL &&
!(exp->ex_flags & NFSEXP_NOSUBTREECHECK)) {
if (exp->ex_dentry != dentry) { if (exp->ex_dentry != dentry) {
struct dentry *tdentry = dentry; struct dentry *tdentry = dentry;
...@@ -701,13 +747,11 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) ...@@ -701,13 +747,11 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
&& !(tdentry->d_inode->i_mode & S_IXOTH) && !(tdentry->d_inode->i_mode & S_IXOTH)
) { ) {
error = nfserr_stale; error = nfserr_stale;
nfsdstats.fh_stale++;
dprintk("fh_verify: no root_squashed access.\n"); dprintk("fh_verify: no root_squashed access.\n");
} }
} while ((tdentry != tdentry->d_parent)); } while ((tdentry != tdentry->d_parent));
if (exp->ex_dentry != tdentry) { if (exp->ex_dentry != tdentry) {
error = nfserr_stale; error = nfserr_stale;
nfsdstats.fh_stale++;
printk("nfsd Security: %s/%s bad export.\n", printk("nfsd Security: %s/%s bad export.\n",
dentry->d_parent->d_name.name, dentry->d_parent->d_name.name,
dentry->d_name.name); dentry->d_name.name);
...@@ -729,9 +773,12 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) ...@@ -729,9 +773,12 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
} }
#endif #endif
out: out:
if (error == nfserr_stale)
nfsdstats.fh_stale++;
return error; return error;
} }
/* /*
* Compose a file handle for an NFS reply. * Compose a file handle for an NFS reply.
* *
...@@ -742,6 +789,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) ...@@ -742,6 +789,7 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
inline int _fh_update(struct dentry *dentry, struct svc_export *exp, inline int _fh_update(struct dentry *dentry, struct svc_export *exp,
__u32 *datap, int *maxsize) __u32 *datap, int *maxsize)
{ {
struct export_operations *nop = exp->ex_mnt->mnt_sb->s_export_op;
struct super_block *sb = dentry->d_sb; struct super_block *sb = dentry->d_sb;
if (dentry == exp->ex_dentry) { if (dentry == exp->ex_dentry) {
...@@ -749,6 +797,10 @@ inline int _fh_update(struct dentry *dentry, struct svc_export *exp, ...@@ -749,6 +797,10 @@ inline int _fh_update(struct dentry *dentry, struct svc_export *exp,
return 0; return 0;
} }
if (nop)
return CALL(nop,encode_fh)(dentry, datap, maxsize,
!(exp->ex_flags&NFSEXP_NOSUBTREECHECK));
if (sb->s_op->dentry_to_fh) { if (sb->s_op->dentry_to_fh) {
int need_parent = !S_ISDIR(dentry->d_inode->i_mode) && int need_parent = !S_ISDIR(dentry->d_inode->i_mode) &&
!(exp->ex_flags & NFSEXP_NOSUBTREECHECK); !(exp->ex_flags & NFSEXP_NOSUBTREECHECK);
...@@ -853,11 +905,11 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, st ...@@ -853,11 +905,11 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, st
_fh_update(dentry, exp, datap, &size); _fh_update(dentry, exp, datap, &size);
fhp->fh_handle.fh_size += size*4; fhp->fh_handle.fh_size += size*4;
} }
if (fhp->fh_handle.fh_fileid_type == 255)
return nfserr_opnotsupp;
} }
nfsd_nr_verified++; nfsd_nr_verified++;
if (fhp->fh_handle.fh_fileid_type == 255)
return nfserr_opnotsupp;
return 0; return 0;
} }
...@@ -889,6 +941,8 @@ fh_update(struct svc_fh *fhp) ...@@ -889,6 +941,8 @@ fh_update(struct svc_fh *fhp)
fhp->fh_handle.fh_fileid_type = fhp->fh_handle.fh_fileid_type =
_fh_update(dentry, fhp->fh_export, datap, &size); _fh_update(dentry, fhp->fh_export, datap, &size);
fhp->fh_handle.fh_size += size*4; fhp->fh_handle.fh_size += size*4;
if (fhp->fh_handle.fh_fileid_type == 255)
return nfserr_opnotsupp;
} }
out: out:
return 0; return 0;
...@@ -921,3 +975,4 @@ fh_put(struct svc_fh *fhp) ...@@ -921,3 +975,4 @@ fh_put(struct svc_fh *fhp)
} }
return; return;
} }
...@@ -117,12 +117,18 @@ d_iput: no no yes ...@@ -117,12 +117,18 @@ d_iput: no no yes
* renamed" and has to be * renamed" and has to be
* deleted on the last dput() * deleted on the last dput()
*/ */
#define DCACHE_DISCONNECTED 0x0004 /* This dentry is not currently connected to the #define DCACHE_DISCONNECTED 0x0004
* dcache tree. Its parent will either be itself, /* This dentry is possibly not currently connected to the dcache tree,
* or will have this flag as well. * in which case its parent will either be itself, or will have this
* If this dentry points to a directory, then * flag as well. nfsd will not use a dentry with this bit set, but will
* s_nfsd_free_path semaphore will be down * first endeavour to clear the bit either by discovering that it is
*/ * connected, or by performing lookup operations. Any filesystem which
* supports nfsd_operations MUST have a lookup function which, if it finds
* a directory inode with a DCACHE_DISCONNECTED dentry, will d_move
* that dentry into place and return that dentry rather than the passed one,
* typically using d_splice_alias.
*/
#define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */ #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */
extern spinlock_t dcache_lock; extern spinlock_t dcache_lock;
......
...@@ -701,6 +701,7 @@ struct super_block { ...@@ -701,6 +701,7 @@ struct super_block {
struct file_system_type *s_type; struct file_system_type *s_type;
struct super_operations *s_op; struct super_operations *s_op;
struct dquot_operations *dq_op; struct dquot_operations *dq_op;
struct export_operations *s_export_op;
unsigned long s_flags; unsigned long s_flags;
unsigned long s_magic; unsigned long s_magic;
struct dentry *s_root; struct dentry *s_root;
...@@ -936,6 +937,110 @@ struct dquot_operations { ...@@ -936,6 +937,110 @@ struct dquot_operations {
int (*transfer) (struct inode *, struct iattr *); int (*transfer) (struct inode *, struct iattr *);
}; };
/**
* &export_operations - for nfsd to communicate with file systems
* decode_fh: decode a file handle fragment and return a &struct dentry
* encode_fh: encode a file handle fragment from a dentry
* get_name: find the name for a given inode in a given directory
* get_parent: find the parent of a given directory
* get_dentry: find a dentry for the inode given a file handle sub-fragment
*
* Description:
* The export_operations structure provides a means for nfsd to communicate
* with a particular exported file system - particularly enabling nfsd and
* the filesystem to co-operate when dealing with file handles.
*
* export_operations contains two basic operation for dealing with file handles,
* decode_fh() and encode_fh(), and allows for some other operations to be defined
* which standard helper routines use to get specific information from the
* filesystem.
*
* nfsd encodes information use to determine which filesystem a filehandle
* applies to in the initial part of the file handle. The remainder, termed a
* file handle fragment, is controlled completely by the filesystem.
* The standard helper routines assume that this fragment will contain one or two
* sub-fragments, one which identifies the file, and one which may be used to
* identify the (a) directory containing the file.
*
* In some situations, nfsd needs to get a dentry which is connected into a
* specific part of the file tree. To allow for this, it passes the function
* acceptable() together with a @context which can be used to see if the dentry
* is acceptable. As there can be multiple dentrys for a given file, the filesystem
* should check each one for acceptability before looking for the next. As soon
* as an acceptable one is found, it should be returned.
*
* decode_fh:
* @decode_fh is given a &struct super_block (@sb), a file handle fragment (@fh, @fh_len)
* and an acceptability testing function (@acceptable, @context). It should return
* a &struct dentry which refers to the same file that the file handle fragment refers
* to, and which passes the acceptability test. If it cannot, it should return
* a %NULL pointer if the file was found but no acceptable &dentries were available, or
* a %ERR_PTR error code indicating why it couldn't be found (e.g. %ENOENT or %ENOMEM).
*
* encode_fh:
* @encode_fh should store in the file handle fragment @fh (using at most @max_len bytes)
* information that can be used by @decode_fh to recover the file refered to by the
* &struct dentry @de. If the @connectable flag is set, the encode_fh() should store
* sufficient information so that a good attempt can be made to find not only
* the file but also it's place in the filesystem. This typically means storing
* a reference to de->d_parent in the filehandle fragment.
* encode_fh() should return the number of bytes stored or a negative error code
* such as %-ENOSPC
*
* get_name:
* @get_name should find a name for the given @child in the given @parent directory.
* The name should be stored in the @name (with the understanding that it is already
* pointing to a a %NAME_MAX+1 sized buffer. get_name() should return %0 on success,
* a negative error code or error.
* @get_name will be called without @parent->i_sem held.
*
* get_parent:
* @get_parent should find the parent directory for the given @child which is also
* a directory. In the event that it cannot be found, or storage space cannot be
* allocated, a %ERR_PTR should be returned.
*
* get_dentry:
* Given a &super_block (@sb) and a pointer to a file-system specific inode identifier,
* possibly an inode number, (@inump) get_dentry() should find the identified inode and
* return a dentry for that inode.
* Any suitable dentry can be returned including, if necessary, a new dentry created
* with d_alloc_root. The caller can then find any other extant dentrys by following the
* d_alias links. If a new dentry was created using d_alloc_root, DCACHE_NFSD_DISCONNECTED
* should be set, and the dentry should be d_rehash()ed.
*
* If the inode cannot be found, either a %NULL pointer or an %ERR_PTR code can be returned.
* The @inump will be whatever was passed to nfsd_find_fh_dentry() in either the
* @obj or @parent parameters.
*
* Locking rules:
* get_parent is called with child->d_inode->i_sem down
* get_name is not (which is possibly inconsistent)
*/
struct export_operations {
struct dentry *(*decode_fh)(struct super_block *sb, __u32 *fh, int fh_len, int fh_type,
int (*acceptable)(void *context, struct dentry *de),
void *context);
int (*encode_fh)(struct dentry *de, __u32 *fh, int *max_len,
int connectable);
/* the following are only called from the filesystem itself */
int (*get_name)(struct dentry *parent, char *name,
struct dentry *child);
struct dentry * (*get_parent)(struct dentry *child);
struct dentry * (*get_dentry)(struct super_block *sb, void *inump);
/* This is set by the exporting module to a standard helper */
struct dentry * (*find_exported_dentry)(
struct super_block *sb, void *obj, void *parent,
int (*acceptable)(void *context, struct dentry *de),
void *context);
};
struct file_system_type { struct file_system_type {
const char *name; const char *name;
int fs_flags; int fs_flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment