2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* Syscall interface to knfsd.
|
|
|
|
*
|
|
|
|
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
|
|
|
|
*/
|
|
|
|
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 02:04:11 -06:00
|
|
|
#include <linux/slab.h>
|
2008-07-26 01:46:43 -06:00
|
|
|
#include <linux/namei.h>
|
2006-10-02 03:17:48 -06:00
|
|
|
#include <linux/ctype.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#include <linux/nfsd_idmap.h>
|
2006-10-02 03:17:47 -06:00
|
|
|
#include <linux/sunrpc/svcsock.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include <linux/nfsd/syscall.h>
|
lockd: unlock lockd locks associated with a given server ip
For high-availability NFS service, we generally need to be able to drop
file locks held on the exported filesystem before moving clients to a
new server. Currently the only way to do that is by shutting down lockd
entirely, which is often undesireable (for example, if you want to
continue exporting other filesystems).
This patch allows the administrator to release all locks held by clients
accessing the client through a given server ip address, by echoing that
address to a new file, /proc/fs/nfsd/unlock_ip, as in:
shell> echo 10.1.1.2 > /proc/fs/nfsd/unlock_ip
The expected sequence of events can be:
1. Tear down the IP address
2. Unexport the path
3. Write IP to /proc/fs/nfsd/unlock_ip to unlock files
4. Signal peer to begin take-over.
For now we only support IPv4 addresses and NFSv2/v3 (NFSv4 locks are not
affected).
Also, if unmounting the filesystem is required, we assume at step 3 that
clients using the given server ip are the only clients holding locks on
the given filesystem; otherwise, an additional patch is required to
allow revoking all locks held by lockd on a given filesystem.
Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Cc: Lon Hohberger <lhh@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
fs/lockd/svcsubs.c | 66 +++++++++++++++++++++++++++++++++++++++-----
fs/nfsd/nfsctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/lockd.h | 7 ++++
3 files changed, 131 insertions(+), 7 deletions(-)
2008-01-17 09:10:12 -07:00
|
|
|
#include <linux/lockd/lockd.h>
|
2009-08-09 13:09:40 -06:00
|
|
|
#include <linux/sunrpc/clnt.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2009-12-03 11:30:56 -07:00
|
|
|
#include "nfsd.h"
|
|
|
|
#include "cache.h"
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* We have a single directory with 9 nodes in it.
|
|
|
|
*/
|
|
|
|
enum {
|
|
|
|
NFSD_Root = 1,
|
|
|
|
NFSD_Svc,
|
|
|
|
NFSD_Add,
|
|
|
|
NFSD_Del,
|
|
|
|
NFSD_Export,
|
|
|
|
NFSD_Unexport,
|
|
|
|
NFSD_Getfd,
|
|
|
|
NFSD_Getfs,
|
|
|
|
NFSD_List,
|
2009-12-14 10:53:32 -07:00
|
|
|
NFSD_Export_features,
|
2005-04-16 16:20:36 -06:00
|
|
|
NFSD_Fh,
|
lockd: unlock lockd locks associated with a given server ip
For high-availability NFS service, we generally need to be able to drop
file locks held on the exported filesystem before moving clients to a
new server. Currently the only way to do that is by shutting down lockd
entirely, which is often undesireable (for example, if you want to
continue exporting other filesystems).
This patch allows the administrator to release all locks held by clients
accessing the client through a given server ip address, by echoing that
address to a new file, /proc/fs/nfsd/unlock_ip, as in:
shell> echo 10.1.1.2 > /proc/fs/nfsd/unlock_ip
The expected sequence of events can be:
1. Tear down the IP address
2. Unexport the path
3. Write IP to /proc/fs/nfsd/unlock_ip to unlock files
4. Signal peer to begin take-over.
For now we only support IPv4 addresses and NFSv2/v3 (NFSv4 locks are not
affected).
Also, if unmounting the filesystem is required, we assume at step 3 that
clients using the given server ip are the only clients holding locks on
the given filesystem; otherwise, an additional patch is required to
allow revoking all locks held by lockd on a given filesystem.
Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Cc: Lon Hohberger <lhh@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
fs/lockd/svcsubs.c | 66 +++++++++++++++++++++++++++++++++++++++-----
fs/nfsd/nfsctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/lockd.h | 7 ++++
3 files changed, 131 insertions(+), 7 deletions(-)
2008-01-17 09:10:12 -07:00
|
|
|
NFSD_FO_UnlockIP,
|
2008-01-17 09:10:12 -07:00
|
|
|
NFSD_FO_UnlockFS,
|
2005-04-16 16:20:36 -06:00
|
|
|
NFSD_Threads,
|
2006-10-02 03:18:02 -06:00
|
|
|
NFSD_Pool_Threads,
|
2009-01-13 03:26:36 -07:00
|
|
|
NFSD_Pool_Stats,
|
2005-11-07 02:00:25 -07:00
|
|
|
NFSD_Versions,
|
2006-10-02 03:17:47 -06:00
|
|
|
NFSD_Ports,
|
2006-10-04 03:15:48 -06:00
|
|
|
NFSD_MaxBlkSize,
|
2005-11-07 02:00:25 -07:00
|
|
|
/*
|
|
|
|
* The below MUST come last. Otherwise we leave a hole in nfsd_files[]
|
|
|
|
* with !CONFIG_NFSD_V4 and simple_fill_super() goes oops
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_NFSD_V4
|
2005-04-16 16:20:36 -06:00
|
|
|
NFSD_Leasetime,
|
2010-03-02 09:04:06 -07:00
|
|
|
NFSD_Gracetime,
|
2005-06-23 23:04:32 -06:00
|
|
|
NFSD_RecoveryDir,
|
2005-11-07 02:00:25 -07:00
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* write() for these nodes.
|
|
|
|
*/
|
|
|
|
static ssize_t write_svc(struct file *file, char *buf, size_t size);
|
|
|
|
static ssize_t write_add(struct file *file, char *buf, size_t size);
|
|
|
|
static ssize_t write_del(struct file *file, char *buf, size_t size);
|
|
|
|
static ssize_t write_export(struct file *file, char *buf, size_t size);
|
|
|
|
static ssize_t write_unexport(struct file *file, char *buf, size_t size);
|
|
|
|
static ssize_t write_getfd(struct file *file, char *buf, size_t size);
|
|
|
|
static ssize_t write_getfs(struct file *file, char *buf, size_t size);
|
|
|
|
static ssize_t write_filehandle(struct file *file, char *buf, size_t size);
|
2008-12-12 14:57:13 -07:00
|
|
|
static ssize_t write_unlock_ip(struct file *file, char *buf, size_t size);
|
|
|
|
static ssize_t write_unlock_fs(struct file *file, char *buf, size_t size);
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_threads(struct file *file, char *buf, size_t size);
|
2006-10-02 03:18:02 -06:00
|
|
|
static ssize_t write_pool_threads(struct file *file, char *buf, size_t size);
|
2005-11-07 02:00:25 -07:00
|
|
|
static ssize_t write_versions(struct file *file, char *buf, size_t size);
|
2006-10-02 03:17:47 -06:00
|
|
|
static ssize_t write_ports(struct file *file, char *buf, size_t size);
|
2006-10-04 03:15:48 -06:00
|
|
|
static ssize_t write_maxblksize(struct file *file, char *buf, size_t size);
|
2005-11-07 02:00:25 -07:00
|
|
|
#ifdef CONFIG_NFSD_V4
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_leasetime(struct file *file, char *buf, size_t size);
|
2010-03-02 09:04:06 -07:00
|
|
|
static ssize_t write_gracetime(struct file *file, char *buf, size_t size);
|
2005-06-23 23:04:32 -06:00
|
|
|
static ssize_t write_recoverydir(struct file *file, char *buf, size_t size);
|
2005-11-07 02:00:25 -07:00
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
static ssize_t (*write_op[])(struct file *, char *, size_t) = {
|
|
|
|
[NFSD_Svc] = write_svc,
|
|
|
|
[NFSD_Add] = write_add,
|
|
|
|
[NFSD_Del] = write_del,
|
|
|
|
[NFSD_Export] = write_export,
|
|
|
|
[NFSD_Unexport] = write_unexport,
|
|
|
|
[NFSD_Getfd] = write_getfd,
|
|
|
|
[NFSD_Getfs] = write_getfs,
|
|
|
|
[NFSD_Fh] = write_filehandle,
|
2008-12-12 14:57:13 -07:00
|
|
|
[NFSD_FO_UnlockIP] = write_unlock_ip,
|
|
|
|
[NFSD_FO_UnlockFS] = write_unlock_fs,
|
2005-04-16 16:20:36 -06:00
|
|
|
[NFSD_Threads] = write_threads,
|
2006-10-02 03:18:02 -06:00
|
|
|
[NFSD_Pool_Threads] = write_pool_threads,
|
2005-11-07 02:00:25 -07:00
|
|
|
[NFSD_Versions] = write_versions,
|
2006-10-02 03:17:47 -06:00
|
|
|
[NFSD_Ports] = write_ports,
|
2006-10-04 03:15:48 -06:00
|
|
|
[NFSD_MaxBlkSize] = write_maxblksize,
|
2005-11-07 02:00:25 -07:00
|
|
|
#ifdef CONFIG_NFSD_V4
|
2005-04-16 16:20:36 -06:00
|
|
|
[NFSD_Leasetime] = write_leasetime,
|
2010-03-02 09:04:06 -07:00
|
|
|
[NFSD_Gracetime] = write_gracetime,
|
2005-06-23 23:04:32 -06:00
|
|
|
[NFSD_RecoveryDir] = write_recoverydir,
|
2005-11-07 02:00:25 -07:00
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
static ssize_t nfsctl_transaction_write(struct file *file, const char __user *buf, size_t size, loff_t *pos)
|
|
|
|
{
|
2006-12-08 03:36:41 -07:00
|
|
|
ino_t ino = file->f_path.dentry->d_inode->i_ino;
|
2005-04-16 16:20:36 -06:00
|
|
|
char *data;
|
|
|
|
ssize_t rv;
|
|
|
|
|
2006-03-24 04:15:34 -07:00
|
|
|
if (ino >= ARRAY_SIZE(write_op) || !write_op[ino])
|
2005-04-16 16:20:36 -06:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
data = simple_transaction_get(file, buf, size);
|
|
|
|
if (IS_ERR(data))
|
|
|
|
return PTR_ERR(data);
|
|
|
|
|
|
|
|
rv = write_op[ino](file, data, size);
|
2007-02-14 01:33:11 -07:00
|
|
|
if (rv >= 0) {
|
2005-04-16 16:20:36 -06:00
|
|
|
simple_transaction_set(file, rv);
|
|
|
|
rv = size;
|
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2005-11-07 02:00:24 -07:00
|
|
|
static ssize_t nfsctl_transaction_read(struct file *file, char __user *buf, size_t size, loff_t *pos)
|
|
|
|
{
|
|
|
|
if (! file->private_data) {
|
|
|
|
/* An attempt to read a transaction file without writing
|
|
|
|
* causes a 0-byte write so that the file can return
|
|
|
|
* state information
|
|
|
|
*/
|
|
|
|
ssize_t rv = nfsctl_transaction_write(file, buf, 0, pos);
|
|
|
|
if (rv < 0)
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
return simple_transaction_read(file, buf, size, pos);
|
|
|
|
}
|
|
|
|
|
2006-03-28 02:56:42 -07:00
|
|
|
static const struct file_operations transaction_ops = {
|
2005-04-16 16:20:36 -06:00
|
|
|
.write = nfsctl_transaction_write,
|
2005-11-07 02:00:24 -07:00
|
|
|
.read = nfsctl_transaction_read,
|
2005-04-16 16:20:36 -06:00
|
|
|
.release = simple_transaction_release,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int exports_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
return seq_open(file, &nfs_exports_op);
|
|
|
|
}
|
|
|
|
|
2006-03-28 02:56:42 -07:00
|
|
|
static const struct file_operations exports_operations = {
|
2005-04-16 16:20:36 -06:00
|
|
|
.open = exports_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
|
|
|
.release = seq_release,
|
2008-04-29 02:02:04 -06:00
|
|
|
.owner = THIS_MODULE,
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2009-12-14 10:53:32 -07:00
|
|
|
static int export_features_show(struct seq_file *m, void *v)
|
|
|
|
{
|
|
|
|
seq_printf(m, "0x%x 0x%x\n", NFSEXP_ALLFLAGS, NFSEXP_SECINFO_FLAGS);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int export_features_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
return single_open(file, export_features_show, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct file_operations export_features_operations = {
|
|
|
|
.open = export_features_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
|
|
|
.release = single_release,
|
|
|
|
};
|
|
|
|
|
2009-01-13 03:26:36 -07:00
|
|
|
extern int nfsd_pool_stats_open(struct inode *inode, struct file *file);
|
2009-08-15 09:54:41 -06:00
|
|
|
extern int nfsd_pool_stats_release(struct inode *inode, struct file *file);
|
2009-01-13 03:26:36 -07:00
|
|
|
|
2009-10-01 16:43:56 -06:00
|
|
|
static const struct file_operations pool_stats_operations = {
|
2009-01-13 03:26:36 -07:00
|
|
|
.open = nfsd_pool_stats_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
2009-08-15 09:54:41 -06:00
|
|
|
.release = nfsd_pool_stats_release,
|
2009-01-13 03:26:36 -07:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*----------------------------------------------------------------------------*/
|
|
|
|
/*
|
|
|
|
* payload - write methods
|
|
|
|
*/
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_svc - Start kernel's NFSD server
|
|
|
|
*
|
|
|
|
* Deprecated. /proc/fs/nfsd/threads is preferred.
|
|
|
|
* Function remains to support old versions of nfs-utils.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: struct nfsctl_svc
|
|
|
|
* svc_port: port number of this
|
|
|
|
* server's listener
|
|
|
|
* svc_nthreads: number of threads to start
|
|
|
|
* size: size in bytes of passed in nfsctl_svc
|
|
|
|
* Output:
|
|
|
|
* On success: returns zero
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_svc(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
struct nfsctl_svc *data;
|
nfsd: don't take nfsd_mutex twice when setting number of threads.
Currently when we write a number to 'threads' in nfsdfs,
we take the nfsd_mutex, update the number of threads, then take the
mutex again to read the number of threads.
Mostly this isn't a big deal. However if we are write '0', and
portmap happens to be dead, then we can get unpredictable behaviour.
If the nfsd threads all got killed quickly and the last thread is
waiting for portmap to respond, then the second time we take the mutex
we will block waiting for the last thread.
However if the nfsd threads didn't die quite that fast, then there
will be no contention when we try to take the mutex again.
Unpredictability isn't fun, and waiting for the last thread to exit is
pointless, so avoid taking the lock twice.
To achieve this, get nfsd_svc return a non-negative number of active
threads when not returning a negative error.
Signed-off-by: NeilBrown <neilb@suse.de>
2009-06-15 19:03:07 -06:00
|
|
|
int err;
|
2005-04-16 16:20:36 -06:00
|
|
|
if (size < sizeof(*data))
|
|
|
|
return -EINVAL;
|
|
|
|
data = (struct nfsctl_svc*) buf;
|
nfsd: don't take nfsd_mutex twice when setting number of threads.
Currently when we write a number to 'threads' in nfsdfs,
we take the nfsd_mutex, update the number of threads, then take the
mutex again to read the number of threads.
Mostly this isn't a big deal. However if we are write '0', and
portmap happens to be dead, then we can get unpredictable behaviour.
If the nfsd threads all got killed quickly and the last thread is
waiting for portmap to respond, then the second time we take the mutex
we will block waiting for the last thread.
However if the nfsd threads didn't die quite that fast, then there
will be no contention when we try to take the mutex again.
Unpredictability isn't fun, and waiting for the last thread to exit is
pointless, so avoid taking the lock twice.
To achieve this, get nfsd_svc return a non-negative number of active
threads when not returning a negative error.
Signed-off-by: NeilBrown <neilb@suse.de>
2009-06-15 19:03:07 -06:00
|
|
|
err = nfsd_svc(data->svc_port, data->svc_nthreads);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
return 0;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_add - Add or modify client entry in auth unix cache
|
|
|
|
*
|
|
|
|
* Deprecated. /proc/net/rpc/auth.unix.ip is preferred.
|
|
|
|
* Function remains to support old versions of nfs-utils.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: struct nfsctl_client
|
|
|
|
* cl_ident: '\0'-terminated C string
|
|
|
|
* containing domain name
|
|
|
|
* of client
|
|
|
|
* cl_naddr: no. of items in cl_addrlist
|
|
|
|
* cl_addrlist: array of client addresses
|
|
|
|
* cl_fhkeytype: ignored
|
|
|
|
* cl_fhkeylen: ignored
|
|
|
|
* cl_fhkey: ignored
|
|
|
|
* size: size in bytes of passed in nfsctl_client
|
|
|
|
* Output:
|
|
|
|
* On success: returns zero
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*
|
|
|
|
* Note: Only AF_INET client addresses are passed in, since
|
|
|
|
* nfsctl_client.cl_addrlist contains only in_addr fields for addresses.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_add(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
struct nfsctl_client *data;
|
|
|
|
if (size < sizeof(*data))
|
|
|
|
return -EINVAL;
|
|
|
|
data = (struct nfsctl_client *)buf;
|
|
|
|
return exp_addclient(data);
|
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_del - Remove client from auth unix cache
|
|
|
|
*
|
|
|
|
* Deprecated. /proc/net/rpc/auth.unix.ip is preferred.
|
|
|
|
* Function remains to support old versions of nfs-utils.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: struct nfsctl_client
|
|
|
|
* cl_ident: '\0'-terminated C string
|
|
|
|
* containing domain name
|
|
|
|
* of client
|
|
|
|
* cl_naddr: ignored
|
|
|
|
* cl_addrlist: ignored
|
|
|
|
* cl_fhkeytype: ignored
|
|
|
|
* cl_fhkeylen: ignored
|
|
|
|
* cl_fhkey: ignored
|
|
|
|
* size: size in bytes of passed in nfsctl_client
|
|
|
|
* Output:
|
|
|
|
* On success: returns zero
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*
|
|
|
|
* Note: Only AF_INET client addresses are passed in, since
|
|
|
|
* nfsctl_client.cl_addrlist contains only in_addr fields for addresses.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_del(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
struct nfsctl_client *data;
|
|
|
|
if (size < sizeof(*data))
|
|
|
|
return -EINVAL;
|
|
|
|
data = (struct nfsctl_client *)buf;
|
|
|
|
return exp_delclient(data);
|
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_export - Export part or all of a local file system
|
|
|
|
*
|
|
|
|
* Deprecated. /proc/net/rpc/{nfsd.export,nfsd.fh} are preferred.
|
|
|
|
* Function remains to support old versions of nfs-utils.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: struct nfsctl_export
|
|
|
|
* ex_client: '\0'-terminated C string
|
|
|
|
* containing domain name
|
|
|
|
* of client allowed to access
|
|
|
|
* this export
|
|
|
|
* ex_path: '\0'-terminated C string
|
|
|
|
* containing pathname of
|
|
|
|
* directory in local file system
|
|
|
|
* ex_dev: fsid to use for this export
|
|
|
|
* ex_ino: ignored
|
|
|
|
* ex_flags: export flags for this export
|
|
|
|
* ex_anon_uid: UID to use for anonymous
|
|
|
|
* requests
|
|
|
|
* ex_anon_gid: GID to use for anonymous
|
|
|
|
* requests
|
|
|
|
* size: size in bytes of passed in nfsctl_export
|
|
|
|
* Output:
|
|
|
|
* On success: returns zero
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_export(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
struct nfsctl_export *data;
|
|
|
|
if (size < sizeof(*data))
|
|
|
|
return -EINVAL;
|
|
|
|
data = (struct nfsctl_export*)buf;
|
|
|
|
return exp_export(data);
|
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_unexport - Unexport a previously exported file system
|
|
|
|
*
|
|
|
|
* Deprecated. /proc/net/rpc/{nfsd.export,nfsd.fh} are preferred.
|
|
|
|
* Function remains to support old versions of nfs-utils.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: struct nfsctl_export
|
|
|
|
* ex_client: '\0'-terminated C string
|
|
|
|
* containing domain name
|
|
|
|
* of client no longer allowed
|
|
|
|
* to access this export
|
|
|
|
* ex_path: '\0'-terminated C string
|
|
|
|
* containing pathname of
|
|
|
|
* directory in local file system
|
|
|
|
* ex_dev: ignored
|
|
|
|
* ex_ino: ignored
|
|
|
|
* ex_flags: ignored
|
|
|
|
* ex_anon_uid: ignored
|
|
|
|
* ex_anon_gid: ignored
|
|
|
|
* size: size in bytes of passed in nfsctl_export
|
|
|
|
* Output:
|
|
|
|
* On success: returns zero
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_unexport(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
struct nfsctl_export *data;
|
|
|
|
|
|
|
|
if (size < sizeof(*data))
|
|
|
|
return -EINVAL;
|
|
|
|
data = (struct nfsctl_export*)buf;
|
|
|
|
return exp_unexport(data);
|
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_getfs - Get a variable-length NFS file handle by path
|
|
|
|
*
|
|
|
|
* Deprecated. /proc/fs/nfsd/filehandle is preferred.
|
|
|
|
* Function remains to support old versions of nfs-utils.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: struct nfsctl_fsparm
|
|
|
|
* gd_addr: socket address of client
|
|
|
|
* gd_path: '\0'-terminated C string
|
|
|
|
* containing pathname of
|
|
|
|
* directory in local file system
|
|
|
|
* gd_maxlen: maximum size of returned file
|
|
|
|
* handle
|
|
|
|
* size: size in bytes of passed in nfsctl_fsparm
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with a knfsd_fh structure
|
|
|
|
* (a variable-length raw NFS file handle);
|
|
|
|
* return code is the size in bytes of the file handle
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*
|
|
|
|
* Note: Only AF_INET client addresses are passed in, since gd_addr
|
|
|
|
* is the same size as a struct sockaddr_in.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_getfs(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
struct nfsctl_fsparm *data;
|
|
|
|
struct sockaddr_in *sin;
|
|
|
|
struct auth_domain *clp;
|
|
|
|
int err = 0;
|
|
|
|
struct knfsd_fh *res;
|
2008-01-18 07:50:56 -07:00
|
|
|
struct in6_addr in6;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
if (size < sizeof(*data))
|
|
|
|
return -EINVAL;
|
|
|
|
data = (struct nfsctl_fsparm*)buf;
|
|
|
|
err = -EPROTONOSUPPORT;
|
|
|
|
if (data->gd_addr.sa_family != AF_INET)
|
|
|
|
goto out;
|
|
|
|
sin = (struct sockaddr_in *)&data->gd_addr;
|
|
|
|
if (data->gd_maxlen > NFS3_FHSIZE)
|
|
|
|
data->gd_maxlen = NFS3_FHSIZE;
|
|
|
|
|
|
|
|
res = (struct knfsd_fh*)buf;
|
|
|
|
|
|
|
|
exp_readlock();
|
2008-01-18 07:50:56 -07:00
|
|
|
|
|
|
|
ipv6_addr_set_v4mapped(sin->sin_addr.s_addr, &in6);
|
|
|
|
|
|
|
|
clp = auth_unix_lookup(&in6);
|
|
|
|
if (!clp)
|
2005-04-16 16:20:36 -06:00
|
|
|
err = -EPERM;
|
|
|
|
else {
|
|
|
|
err = exp_rootfh(clp, data->gd_path, res, data->gd_maxlen);
|
|
|
|
auth_domain_put(clp);
|
|
|
|
}
|
|
|
|
exp_readunlock();
|
|
|
|
if (err == 0)
|
2007-07-17 05:04:34 -06:00
|
|
|
err = res->fh_size + offsetof(struct knfsd_fh, fh_base);
|
2005-04-16 16:20:36 -06:00
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_getfd - Get a fixed-length NFS file handle by path (used by mountd)
|
|
|
|
*
|
|
|
|
* Deprecated. /proc/fs/nfsd/filehandle is preferred.
|
|
|
|
* Function remains to support old versions of nfs-utils.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: struct nfsctl_fdparm
|
|
|
|
* gd_addr: socket address of client
|
|
|
|
* gd_path: '\0'-terminated C string
|
|
|
|
* containing pathname of
|
|
|
|
* directory in local file system
|
|
|
|
* gd_version: fdparm structure version
|
|
|
|
* size: size in bytes of passed in nfsctl_fdparm
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with nfsctl_res
|
|
|
|
* (a fixed-length raw NFS file handle);
|
|
|
|
* return code is the size in bytes of the file handle
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*
|
|
|
|
* Note: Only AF_INET client addresses are passed in, since gd_addr
|
|
|
|
* is the same size as a struct sockaddr_in.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_getfd(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
struct nfsctl_fdparm *data;
|
|
|
|
struct sockaddr_in *sin;
|
|
|
|
struct auth_domain *clp;
|
|
|
|
int err = 0;
|
|
|
|
struct knfsd_fh fh;
|
|
|
|
char *res;
|
2008-01-18 07:50:56 -07:00
|
|
|
struct in6_addr in6;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
if (size < sizeof(*data))
|
|
|
|
return -EINVAL;
|
|
|
|
data = (struct nfsctl_fdparm*)buf;
|
|
|
|
err = -EPROTONOSUPPORT;
|
|
|
|
if (data->gd_addr.sa_family != AF_INET)
|
|
|
|
goto out;
|
|
|
|
err = -EINVAL;
|
|
|
|
if (data->gd_version < 2 || data->gd_version > NFSSVC_MAXVERS)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
res = buf;
|
|
|
|
sin = (struct sockaddr_in *)&data->gd_addr;
|
|
|
|
exp_readlock();
|
2008-01-18 07:50:56 -07:00
|
|
|
|
|
|
|
ipv6_addr_set_v4mapped(sin->sin_addr.s_addr, &in6);
|
|
|
|
|
|
|
|
clp = auth_unix_lookup(&in6);
|
|
|
|
if (!clp)
|
2005-04-16 16:20:36 -06:00
|
|
|
err = -EPERM;
|
|
|
|
else {
|
|
|
|
err = exp_rootfh(clp, data->gd_path, &fh, NFS_FHSIZE);
|
|
|
|
auth_domain_put(clp);
|
|
|
|
}
|
|
|
|
exp_readunlock();
|
|
|
|
|
|
|
|
if (err == 0) {
|
|
|
|
memset(res,0, NFS_FHSIZE);
|
|
|
|
memcpy(res, &fh.fh_base, fh.fh_size);
|
|
|
|
err = NFS_FHSIZE;
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_unlock_ip - Release all locks used by a client
|
|
|
|
*
|
|
|
|
* Experimental.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: '\n'-terminated C string containing a
|
2009-08-09 13:09:40 -06:00
|
|
|
* presentation format IP address
|
2008-12-12 14:57:35 -07:00
|
|
|
* size: length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: returns zero if all specified locks were released;
|
|
|
|
* returns one if one or more locks were not released
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*/
|
2008-12-12 14:57:13 -07:00
|
|
|
static ssize_t write_unlock_ip(struct file *file, char *buf, size_t size)
|
lockd: unlock lockd locks associated with a given server ip
For high-availability NFS service, we generally need to be able to drop
file locks held on the exported filesystem before moving clients to a
new server. Currently the only way to do that is by shutting down lockd
entirely, which is often undesireable (for example, if you want to
continue exporting other filesystems).
This patch allows the administrator to release all locks held by clients
accessing the client through a given server ip address, by echoing that
address to a new file, /proc/fs/nfsd/unlock_ip, as in:
shell> echo 10.1.1.2 > /proc/fs/nfsd/unlock_ip
The expected sequence of events can be:
1. Tear down the IP address
2. Unexport the path
3. Write IP to /proc/fs/nfsd/unlock_ip to unlock files
4. Signal peer to begin take-over.
For now we only support IPv4 addresses and NFSv2/v3 (NFSv4 locks are not
affected).
Also, if unmounting the filesystem is required, we assume at step 3 that
clients using the given server ip are the only clients holding locks on
the given filesystem; otherwise, an additional patch is required to
allow revoking all locks held by lockd on a given filesystem.
Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Cc: Lon Hohberger <lhh@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
fs/lockd/svcsubs.c | 66 +++++++++++++++++++++++++++++++++++++++-----
fs/nfsd/nfsctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/lockd.h | 7 ++++
3 files changed, 131 insertions(+), 7 deletions(-)
2008-01-17 09:10:12 -07:00
|
|
|
{
|
2009-08-09 13:09:40 -06:00
|
|
|
struct sockaddr_storage address;
|
|
|
|
struct sockaddr *sap = (struct sockaddr *)&address;
|
|
|
|
size_t salen = sizeof(address);
|
2008-06-30 16:58:14 -06:00
|
|
|
char *fo_path;
|
lockd: unlock lockd locks associated with a given server ip
For high-availability NFS service, we generally need to be able to drop
file locks held on the exported filesystem before moving clients to a
new server. Currently the only way to do that is by shutting down lockd
entirely, which is often undesireable (for example, if you want to
continue exporting other filesystems).
This patch allows the administrator to release all locks held by clients
accessing the client through a given server ip address, by echoing that
address to a new file, /proc/fs/nfsd/unlock_ip, as in:
shell> echo 10.1.1.2 > /proc/fs/nfsd/unlock_ip
The expected sequence of events can be:
1. Tear down the IP address
2. Unexport the path
3. Write IP to /proc/fs/nfsd/unlock_ip to unlock files
4. Signal peer to begin take-over.
For now we only support IPv4 addresses and NFSv2/v3 (NFSv4 locks are not
affected).
Also, if unmounting the filesystem is required, we assume at step 3 that
clients using the given server ip are the only clients holding locks on
the given filesystem; otherwise, an additional patch is required to
allow revoking all locks held by lockd on a given filesystem.
Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Cc: Lon Hohberger <lhh@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
fs/lockd/svcsubs.c | 66 +++++++++++++++++++++++++++++++++++++++-----
fs/nfsd/nfsctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/lockd.h | 7 ++++
3 files changed, 131 insertions(+), 7 deletions(-)
2008-01-17 09:10:12 -07:00
|
|
|
|
|
|
|
/* sanity check */
|
|
|
|
if (size == 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (buf[size-1] != '\n')
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
fo_path = buf;
|
|
|
|
if (qword_get(&buf, fo_path, size) < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2009-08-09 13:09:40 -06:00
|
|
|
if (rpc_pton(fo_path, size, sap, salen) == 0)
|
lockd: unlock lockd locks associated with a given server ip
For high-availability NFS service, we generally need to be able to drop
file locks held on the exported filesystem before moving clients to a
new server. Currently the only way to do that is by shutting down lockd
entirely, which is often undesireable (for example, if you want to
continue exporting other filesystems).
This patch allows the administrator to release all locks held by clients
accessing the client through a given server ip address, by echoing that
address to a new file, /proc/fs/nfsd/unlock_ip, as in:
shell> echo 10.1.1.2 > /proc/fs/nfsd/unlock_ip
The expected sequence of events can be:
1. Tear down the IP address
2. Unexport the path
3. Write IP to /proc/fs/nfsd/unlock_ip to unlock files
4. Signal peer to begin take-over.
For now we only support IPv4 addresses and NFSv2/v3 (NFSv4 locks are not
affected).
Also, if unmounting the filesystem is required, we assume at step 3 that
clients using the given server ip are the only clients holding locks on
the given filesystem; otherwise, an additional patch is required to
allow revoking all locks held by lockd on a given filesystem.
Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Cc: Lon Hohberger <lhh@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
fs/lockd/svcsubs.c | 66 +++++++++++++++++++++++++++++++++++++++-----
fs/nfsd/nfsctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/lockd.h | 7 ++++
3 files changed, 131 insertions(+), 7 deletions(-)
2008-01-17 09:10:12 -07:00
|
|
|
return -EINVAL;
|
|
|
|
|
2009-08-09 13:09:40 -06:00
|
|
|
return nlmsvc_unlock_all_by_ip(sap);
|
lockd: unlock lockd locks associated with a given server ip
For high-availability NFS service, we generally need to be able to drop
file locks held on the exported filesystem before moving clients to a
new server. Currently the only way to do that is by shutting down lockd
entirely, which is often undesireable (for example, if you want to
continue exporting other filesystems).
This patch allows the administrator to release all locks held by clients
accessing the client through a given server ip address, by echoing that
address to a new file, /proc/fs/nfsd/unlock_ip, as in:
shell> echo 10.1.1.2 > /proc/fs/nfsd/unlock_ip
The expected sequence of events can be:
1. Tear down the IP address
2. Unexport the path
3. Write IP to /proc/fs/nfsd/unlock_ip to unlock files
4. Signal peer to begin take-over.
For now we only support IPv4 addresses and NFSv2/v3 (NFSv4 locks are not
affected).
Also, if unmounting the filesystem is required, we assume at step 3 that
clients using the given server ip are the only clients holding locks on
the given filesystem; otherwise, an additional patch is required to
allow revoking all locks held by lockd on a given filesystem.
Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Cc: Lon Hohberger <lhh@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
fs/lockd/svcsubs.c | 66 +++++++++++++++++++++++++++++++++++++++-----
fs/nfsd/nfsctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/lockd.h | 7 ++++
3 files changed, 131 insertions(+), 7 deletions(-)
2008-01-17 09:10:12 -07:00
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_unlock_fs - Release all locks on a local file system
|
|
|
|
*
|
|
|
|
* Experimental.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: '\n'-terminated C string containing the
|
|
|
|
* absolute pathname of a local file system
|
|
|
|
* size: length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: returns zero if all specified locks were released;
|
|
|
|
* returns one if one or more locks were not released
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*/
|
2008-12-12 14:57:13 -07:00
|
|
|
static ssize_t write_unlock_fs(struct file *file, char *buf, size_t size)
|
2008-01-17 09:10:12 -07:00
|
|
|
{
|
2008-08-01 23:03:36 -06:00
|
|
|
struct path path;
|
2008-01-17 09:10:12 -07:00
|
|
|
char *fo_path;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
/* sanity check */
|
|
|
|
if (size == 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (buf[size-1] != '\n')
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
fo_path = buf;
|
|
|
|
if (qword_get(&buf, fo_path, size) < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-08-01 23:03:36 -06:00
|
|
|
error = kern_path(fo_path, 0, &path);
|
2008-01-17 09:10:12 -07:00
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/*
|
|
|
|
* XXX: Needs better sanity checking. Otherwise we could end up
|
|
|
|
* releasing locks on the wrong file system.
|
|
|
|
*
|
|
|
|
* For example:
|
|
|
|
* 1. Does the path refer to a directory?
|
|
|
|
* 2. Is that directory a mount point, or
|
|
|
|
* 3. Is that directory the root of an exported file system?
|
|
|
|
*/
|
2008-08-01 23:03:36 -06:00
|
|
|
error = nlmsvc_unlock_all_by_sb(path.mnt->mnt_sb);
|
2008-01-17 09:10:12 -07:00
|
|
|
|
2008-08-01 23:03:36 -06:00
|
|
|
path_put(&path);
|
2008-01-17 09:10:12 -07:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_filehandle - Get a variable-length NFS file handle by path
|
|
|
|
*
|
|
|
|
* On input, the buffer contains a '\n'-terminated C string comprised of
|
|
|
|
* three alphanumeric words separated by whitespace. The string may
|
|
|
|
* contain escape sequences.
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf:
|
|
|
|
* domain: client domain name
|
|
|
|
* path: export pathname
|
|
|
|
* maxsize: numeric maximum size of
|
|
|
|
* @buf
|
|
|
|
* size: length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with '\n'-terminated C
|
|
|
|
* string containing a ASCII hex text version
|
|
|
|
* of the NFS file handle;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is negative errno value
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_filehandle(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
char *dname, *path;
|
2007-08-09 01:53:50 -06:00
|
|
|
int uninitialized_var(maxsize);
|
2005-04-16 16:20:36 -06:00
|
|
|
char *mesg = buf;
|
|
|
|
int len;
|
|
|
|
struct auth_domain *dom;
|
|
|
|
struct knfsd_fh fh;
|
|
|
|
|
2008-01-22 15:40:42 -07:00
|
|
|
if (size == 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
if (buf[size-1] != '\n')
|
|
|
|
return -EINVAL;
|
|
|
|
buf[size-1] = 0;
|
|
|
|
|
|
|
|
dname = mesg;
|
|
|
|
len = qword_get(&mesg, dname, size);
|
2008-12-12 14:57:20 -07:00
|
|
|
if (len <= 0)
|
|
|
|
return -EINVAL;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
path = dname+len+1;
|
|
|
|
len = qword_get(&mesg, path, size);
|
2008-12-12 14:57:20 -07:00
|
|
|
if (len <= 0)
|
|
|
|
return -EINVAL;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
len = get_int(&mesg, &maxsize);
|
|
|
|
if (len)
|
|
|
|
return len;
|
|
|
|
|
|
|
|
if (maxsize < NFS_FHSIZE)
|
|
|
|
return -EINVAL;
|
|
|
|
if (maxsize > NFS3_FHSIZE)
|
|
|
|
maxsize = NFS3_FHSIZE;
|
|
|
|
|
|
|
|
if (qword_get(&mesg, mesg, size)>0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* we have all the words, they are in buf.. */
|
|
|
|
dom = unix_domain_find(dname);
|
|
|
|
if (!dom)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
len = exp_rootfh(dom, path, &fh, maxsize);
|
|
|
|
auth_domain_put(dom);
|
|
|
|
if (len)
|
|
|
|
return len;
|
|
|
|
|
2008-12-12 14:57:20 -07:00
|
|
|
mesg = buf;
|
|
|
|
len = SIMPLE_TRANSACTION_LIMIT;
|
2005-04-16 16:20:36 -06:00
|
|
|
qword_addhex(&mesg, &len, (char*)&fh.fh_base, fh.fh_size);
|
|
|
|
mesg[-1] = '\n';
|
|
|
|
return mesg - buf;
|
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_threads - Start NFSD, or report the current number of running threads
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: ignored
|
|
|
|
* size: zero
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with '\n'-terminated C
|
|
|
|
* string numeric value representing the number of
|
|
|
|
* running NFSD threads;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is zero
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing an unsigned
|
|
|
|
* integer value representing the
|
|
|
|
* number of NFSD threads to start
|
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: NFS service is started;
|
|
|
|
* passed-in buffer filled with '\n'-terminated C
|
|
|
|
* string numeric value representing the number of
|
|
|
|
* running NFSD threads;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is zero or a negative errno value
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static ssize_t write_threads(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
char *mesg = buf;
|
|
|
|
int rv;
|
|
|
|
if (size > 0) {
|
|
|
|
int newthreads;
|
|
|
|
rv = get_int(&mesg, &newthreads);
|
|
|
|
if (rv)
|
|
|
|
return rv;
|
2008-12-12 14:57:27 -07:00
|
|
|
if (newthreads < 0)
|
2005-04-16 16:20:36 -06:00
|
|
|
return -EINVAL;
|
2008-12-12 14:57:27 -07:00
|
|
|
rv = nfsd_svc(NFS_PORT, newthreads);
|
nfsd: don't take nfsd_mutex twice when setting number of threads.
Currently when we write a number to 'threads' in nfsdfs,
we take the nfsd_mutex, update the number of threads, then take the
mutex again to read the number of threads.
Mostly this isn't a big deal. However if we are write '0', and
portmap happens to be dead, then we can get unpredictable behaviour.
If the nfsd threads all got killed quickly and the last thread is
waiting for portmap to respond, then the second time we take the mutex
we will block waiting for the last thread.
However if the nfsd threads didn't die quite that fast, then there
will be no contention when we try to take the mutex again.
Unpredictability isn't fun, and waiting for the last thread to exit is
pointless, so avoid taking the lock twice.
To achieve this, get nfsd_svc return a non-negative number of active
threads when not returning a negative error.
Signed-off-by: NeilBrown <neilb@suse.de>
2009-06-15 19:03:07 -06:00
|
|
|
if (rv < 0)
|
2005-04-16 16:20:36 -06:00
|
|
|
return rv;
|
nfsd: don't take nfsd_mutex twice when setting number of threads.
Currently when we write a number to 'threads' in nfsdfs,
we take the nfsd_mutex, update the number of threads, then take the
mutex again to read the number of threads.
Mostly this isn't a big deal. However if we are write '0', and
portmap happens to be dead, then we can get unpredictable behaviour.
If the nfsd threads all got killed quickly and the last thread is
waiting for portmap to respond, then the second time we take the mutex
we will block waiting for the last thread.
However if the nfsd threads didn't die quite that fast, then there
will be no contention when we try to take the mutex again.
Unpredictability isn't fun, and waiting for the last thread to exit is
pointless, so avoid taking the lock twice.
To achieve this, get nfsd_svc return a non-negative number of active
threads when not returning a negative error.
Signed-off-by: NeilBrown <neilb@suse.de>
2009-06-15 19:03:07 -06:00
|
|
|
} else
|
|
|
|
rv = nfsd_nrthreads();
|
2009-04-23 17:33:25 -06:00
|
|
|
|
nfsd: don't take nfsd_mutex twice when setting number of threads.
Currently when we write a number to 'threads' in nfsdfs,
we take the nfsd_mutex, update the number of threads, then take the
mutex again to read the number of threads.
Mostly this isn't a big deal. However if we are write '0', and
portmap happens to be dead, then we can get unpredictable behaviour.
If the nfsd threads all got killed quickly and the last thread is
waiting for portmap to respond, then the second time we take the mutex
we will block waiting for the last thread.
However if the nfsd threads didn't die quite that fast, then there
will be no contention when we try to take the mutex again.
Unpredictability isn't fun, and waiting for the last thread to exit is
pointless, so avoid taking the lock twice.
To achieve this, get nfsd_svc return a non-negative number of active
threads when not returning a negative error.
Signed-off-by: NeilBrown <neilb@suse.de>
2009-06-15 19:03:07 -06:00
|
|
|
return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%d\n", rv);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_pool_threads - Set or report the current number of threads per pool
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: ignored
|
|
|
|
* size: zero
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing whitespace-
|
|
|
|
* separated unsigned integer values
|
|
|
|
* representing the number of NFSD
|
|
|
|
* threads to start in each pool
|
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with '\n'-terminated C
|
|
|
|
* string containing integer values representing the
|
|
|
|
* number of NFSD threads in each pool;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is zero or a negative errno value
|
|
|
|
*/
|
2006-10-02 03:18:02 -06:00
|
|
|
static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
/* if size > 0, look for an array of number of threads per node
|
|
|
|
* and apply them then write out number of threads per node as reply
|
|
|
|
*/
|
|
|
|
char *mesg = buf;
|
|
|
|
int i;
|
|
|
|
int rv;
|
|
|
|
int len;
|
2008-06-10 06:40:35 -06:00
|
|
|
int npools;
|
2006-10-02 03:18:02 -06:00
|
|
|
int *nthreads;
|
|
|
|
|
2008-06-10 06:40:35 -06:00
|
|
|
mutex_lock(&nfsd_mutex);
|
|
|
|
npools = nfsd_nrpools();
|
2006-10-02 03:18:02 -06:00
|
|
|
if (npools == 0) {
|
|
|
|
/*
|
|
|
|
* NFS is shut down. The admin can start it by
|
|
|
|
* writing to the threads file but NOT the pool_threads
|
|
|
|
* file, sorry. Report zero threads.
|
|
|
|
*/
|
2008-06-10 06:40:35 -06:00
|
|
|
mutex_unlock(&nfsd_mutex);
|
2006-10-02 03:18:02 -06:00
|
|
|
strcpy(buf, "0\n");
|
|
|
|
return strlen(buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
nthreads = kcalloc(npools, sizeof(int), GFP_KERNEL);
|
2008-06-10 06:40:35 -06:00
|
|
|
rv = -ENOMEM;
|
2006-10-02 03:18:02 -06:00
|
|
|
if (nthreads == NULL)
|
2008-06-10 06:40:35 -06:00
|
|
|
goto out_free;
|
2006-10-02 03:18:02 -06:00
|
|
|
|
|
|
|
if (size > 0) {
|
|
|
|
for (i = 0; i < npools; i++) {
|
|
|
|
rv = get_int(&mesg, &nthreads[i]);
|
|
|
|
if (rv == -ENOENT)
|
|
|
|
break; /* fewer numbers than pools */
|
|
|
|
if (rv)
|
|
|
|
goto out_free; /* syntax error */
|
|
|
|
rv = -EINVAL;
|
|
|
|
if (nthreads[i] < 0)
|
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
rv = nfsd_set_nrthreads(i, nthreads);
|
|
|
|
if (rv)
|
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
rv = nfsd_get_nrthreads(npools, nthreads);
|
|
|
|
if (rv)
|
|
|
|
goto out_free;
|
|
|
|
|
|
|
|
mesg = buf;
|
|
|
|
size = SIMPLE_TRANSACTION_LIMIT;
|
|
|
|
for (i = 0; i < npools && size > 0; i++) {
|
|
|
|
snprintf(mesg, size, "%d%c", nthreads[i], (i == npools-1 ? '\n' : ' '));
|
|
|
|
len = strlen(mesg);
|
|
|
|
size -= len;
|
|
|
|
mesg += len;
|
|
|
|
}
|
2009-07-28 09:37:25 -06:00
|
|
|
rv = mesg - buf;
|
2006-10-02 03:18:02 -06:00
|
|
|
out_free:
|
|
|
|
kfree(nthreads);
|
2008-06-10 06:40:35 -06:00
|
|
|
mutex_unlock(&nfsd_mutex);
|
2006-10-02 03:18:02 -06:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2008-06-10 06:40:36 -06:00
|
|
|
static ssize_t __write_versions(struct file *file, char *buf, size_t size)
|
2005-11-07 02:00:25 -07:00
|
|
|
{
|
|
|
|
char *mesg = buf;
|
2009-04-02 23:28:59 -06:00
|
|
|
char *vers, *minorp, sign;
|
2009-04-23 17:33:18 -06:00
|
|
|
int len, num, remaining;
|
2009-04-02 23:28:59 -06:00
|
|
|
unsigned minor;
|
2005-11-07 02:00:25 -07:00
|
|
|
ssize_t tlen = 0;
|
|
|
|
char *sep;
|
|
|
|
|
|
|
|
if (size>0) {
|
|
|
|
if (nfsd_serv)
|
2006-10-02 03:17:46 -06:00
|
|
|
/* Cannot change versions without updating
|
|
|
|
* nfsd_serv->sv_xdrsize, and reallocing
|
|
|
|
* rq_argp and rq_resp
|
|
|
|
*/
|
2005-11-07 02:00:25 -07:00
|
|
|
return -EBUSY;
|
|
|
|
if (buf[size-1] != '\n')
|
|
|
|
return -EINVAL;
|
|
|
|
buf[size-1] = 0;
|
|
|
|
|
|
|
|
vers = mesg;
|
|
|
|
len = qword_get(&mesg, vers, size);
|
|
|
|
if (len <= 0) return -EINVAL;
|
|
|
|
do {
|
|
|
|
sign = *vers;
|
|
|
|
if (sign == '+' || sign == '-')
|
2009-04-02 23:28:59 -06:00
|
|
|
num = simple_strtol((vers+1), &minorp, 0);
|
2005-11-07 02:00:25 -07:00
|
|
|
else
|
2009-04-02 23:28:59 -06:00
|
|
|
num = simple_strtol(vers, &minorp, 0);
|
|
|
|
if (*minorp == '.') {
|
|
|
|
if (num < 4)
|
|
|
|
return -EINVAL;
|
|
|
|
minor = simple_strtoul(minorp+1, NULL, 0);
|
|
|
|
if (minor == 0)
|
|
|
|
return -EINVAL;
|
|
|
|
if (nfsd_minorversion(minor, sign == '-' ?
|
|
|
|
NFSD_CLEAR : NFSD_SET) < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
goto next;
|
|
|
|
}
|
2005-11-07 02:00:25 -07:00
|
|
|
switch(num) {
|
|
|
|
case 2:
|
|
|
|
case 3:
|
|
|
|
case 4:
|
2006-10-02 03:17:46 -06:00
|
|
|
nfsd_vers(num, sign == '-' ? NFSD_CLEAR : NFSD_SET);
|
2005-11-07 02:00:25 -07:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-04-02 23:28:59 -06:00
|
|
|
next:
|
2005-11-07 02:00:25 -07:00
|
|
|
vers += len + 1;
|
|
|
|
} while ((len = qword_get(&mesg, vers, size)) > 0);
|
|
|
|
/* If all get turned off, turn them back on, as
|
|
|
|
* having no versions is BAD
|
|
|
|
*/
|
2006-10-02 03:17:46 -06:00
|
|
|
nfsd_reset_versions();
|
2005-11-07 02:00:25 -07:00
|
|
|
}
|
2009-04-23 17:33:18 -06:00
|
|
|
|
2005-11-07 02:00:25 -07:00
|
|
|
/* Now write current state into reply buffer */
|
|
|
|
len = 0;
|
|
|
|
sep = "";
|
2009-04-23 17:33:18 -06:00
|
|
|
remaining = SIMPLE_TRANSACTION_LIMIT;
|
2005-11-07 02:00:25 -07:00
|
|
|
for (num=2 ; num <= 4 ; num++)
|
2006-10-02 03:17:46 -06:00
|
|
|
if (nfsd_vers(num, NFSD_AVAIL)) {
|
2009-04-23 17:33:18 -06:00
|
|
|
len = snprintf(buf, remaining, "%s%c%d", sep,
|
2006-10-02 03:17:46 -06:00
|
|
|
nfsd_vers(num, NFSD_TEST)?'+':'-',
|
2005-11-07 02:00:25 -07:00
|
|
|
num);
|
|
|
|
sep = " ";
|
2009-04-23 17:33:18 -06:00
|
|
|
|
|
|
|
if (len > remaining)
|
|
|
|
break;
|
|
|
|
remaining -= len;
|
|
|
|
buf += len;
|
|
|
|
tlen += len;
|
2005-11-07 02:00:25 -07:00
|
|
|
}
|
2009-04-02 23:28:59 -06:00
|
|
|
if (nfsd_vers(4, NFSD_AVAIL))
|
2009-04-23 17:33:18 -06:00
|
|
|
for (minor = 1; minor <= NFSD_SUPPORTED_MINOR_VERSION;
|
|
|
|
minor++) {
|
|
|
|
len = snprintf(buf, remaining, " %c4.%u",
|
2009-04-02 23:28:59 -06:00
|
|
|
(nfsd_vers(4, NFSD_TEST) &&
|
|
|
|
nfsd_minorversion(minor, NFSD_TEST)) ?
|
|
|
|
'+' : '-',
|
|
|
|
minor);
|
2009-04-23 17:33:18 -06:00
|
|
|
|
|
|
|
if (len > remaining)
|
|
|
|
break;
|
|
|
|
remaining -= len;
|
|
|
|
buf += len;
|
|
|
|
tlen += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
len = snprintf(buf, remaining, "\n");
|
|
|
|
if (len > remaining)
|
|
|
|
return -EINVAL;
|
|
|
|
return tlen + len;
|
2005-11-07 02:00:25 -07:00
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_versions - Set or report the available NFS protocol versions
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: ignored
|
|
|
|
* size: zero
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with '\n'-terminated C
|
|
|
|
* string containing positive or negative integer
|
|
|
|
* values representing the current status of each
|
|
|
|
* protocol version;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is zero or a negative errno value
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing whitespace-
|
|
|
|
* separated positive or negative
|
|
|
|
* integer values representing NFS
|
|
|
|
* protocol versions to enable ("+n")
|
|
|
|
* or disable ("-n")
|
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: status of zero or more protocol versions has
|
|
|
|
* been updated; passed-in buffer filled with
|
|
|
|
* '\n'-terminated C string containing positive
|
|
|
|
* or negative integer values representing the
|
|
|
|
* current status of each protocol version;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is zero or a negative errno value
|
|
|
|
*/
|
2008-06-10 06:40:36 -06:00
|
|
|
static ssize_t write_versions(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
ssize_t rv;
|
|
|
|
|
|
|
|
mutex_lock(&nfsd_mutex);
|
|
|
|
rv = __write_versions(file, buf, size);
|
|
|
|
mutex_unlock(&nfsd_mutex);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2009-04-23 17:32:10 -06:00
|
|
|
/*
|
|
|
|
* Zero-length write. Return a list of NFSD's current listener
|
|
|
|
* transports.
|
|
|
|
*/
|
|
|
|
static ssize_t __write_ports_names(char *buf)
|
|
|
|
{
|
|
|
|
if (nfsd_serv == NULL)
|
|
|
|
return 0;
|
2009-04-23 17:32:25 -06:00
|
|
|
return svc_xprt_names(nfsd_serv, buf, SIMPLE_TRANSACTION_LIMIT);
|
2009-04-23 17:32:10 -06:00
|
|
|
}
|
|
|
|
|
2009-04-23 17:31:55 -06:00
|
|
|
/*
|
|
|
|
* A single 'fd' number was written, in which case it must be for
|
|
|
|
* a socket of a supported family/protocol, and we use it as an
|
|
|
|
* nfsd listener.
|
|
|
|
*/
|
|
|
|
static ssize_t __write_ports_addfd(char *buf)
|
|
|
|
{
|
|
|
|
char *mesg = buf;
|
|
|
|
int fd, err;
|
|
|
|
|
|
|
|
err = get_int(&mesg, &fd);
|
|
|
|
if (err != 0 || fd < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
err = nfsd_create_serv();
|
|
|
|
if (err != 0)
|
|
|
|
return err;
|
|
|
|
|
2009-04-23 17:32:18 -06:00
|
|
|
err = lockd_up();
|
|
|
|
if (err != 0)
|
|
|
|
goto out;
|
2009-04-23 17:31:55 -06:00
|
|
|
|
2009-04-23 17:32:33 -06:00
|
|
|
err = svc_addsock(nfsd_serv, fd, buf, SIMPLE_TRANSACTION_LIMIT);
|
2009-04-23 17:32:18 -06:00
|
|
|
if (err < 0)
|
|
|
|
lockd_down();
|
2009-04-23 17:31:55 -06:00
|
|
|
|
2009-04-23 17:32:18 -06:00
|
|
|
out:
|
|
|
|
/* Decrease the count, but don't shut down the service */
|
|
|
|
nfsd_serv->sv_nrthreads--;
|
|
|
|
return err;
|
2009-04-23 17:31:55 -06:00
|
|
|
}
|
|
|
|
|
2009-04-23 17:31:48 -06:00
|
|
|
/*
|
|
|
|
* A '-' followed by the 'name' of a socket means we close the socket.
|
|
|
|
*/
|
|
|
|
static ssize_t __write_ports_delfd(char *buf)
|
|
|
|
{
|
|
|
|
char *toclose;
|
|
|
|
int len = 0;
|
|
|
|
|
|
|
|
toclose = kstrdup(buf + 1, GFP_KERNEL);
|
|
|
|
if (toclose == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
if (nfsd_serv != NULL)
|
2009-04-23 17:32:40 -06:00
|
|
|
len = svc_sock_names(nfsd_serv, buf,
|
|
|
|
SIMPLE_TRANSACTION_LIMIT, toclose);
|
2009-04-23 17:31:48 -06:00
|
|
|
if (len >= 0)
|
|
|
|
lockd_down();
|
|
|
|
|
|
|
|
kfree(toclose);
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2009-04-23 17:31:40 -06:00
|
|
|
/*
|
|
|
|
* A transport listener is added by writing it's transport name and
|
|
|
|
* a port number.
|
|
|
|
*/
|
|
|
|
static ssize_t __write_ports_addxprt(char *buf)
|
|
|
|
{
|
|
|
|
char transport[16];
|
2010-01-26 12:04:22 -07:00
|
|
|
struct svc_xprt *xprt;
|
2009-04-23 17:31:40 -06:00
|
|
|
int port, err;
|
|
|
|
|
|
|
|
if (sscanf(buf, "%15s %4u", transport, &port) != 2)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2010-05-24 15:33:03 -06:00
|
|
|
if (port < 1 || port > USHRT_MAX)
|
2009-04-23 17:31:40 -06:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
err = nfsd_create_serv();
|
|
|
|
if (err != 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = svc_create_xprt(nfsd_serv, transport,
|
|
|
|
PF_INET, port, SVC_SOCK_ANONYMOUS);
|
2010-01-26 12:04:13 -07:00
|
|
|
if (err < 0)
|
2010-01-26 12:04:22 -07:00
|
|
|
goto out_err;
|
|
|
|
|
|
|
|
err = svc_create_xprt(nfsd_serv, transport,
|
|
|
|
PF_INET6, port, SVC_SOCK_ANONYMOUS);
|
|
|
|
if (err < 0 && err != -EAFNOSUPPORT)
|
|
|
|
goto out_close;
|
2009-04-23 17:31:40 -06:00
|
|
|
return 0;
|
2010-01-26 12:04:22 -07:00
|
|
|
out_close:
|
|
|
|
xprt = svc_find_xprt(nfsd_serv, transport, PF_INET, port);
|
|
|
|
if (xprt != NULL) {
|
|
|
|
svc_close_xprt(xprt);
|
|
|
|
svc_xprt_put(xprt);
|
|
|
|
}
|
|
|
|
out_err:
|
|
|
|
/* Decrease the count, but don't shut down the service */
|
|
|
|
nfsd_serv->sv_nrthreads--;
|
|
|
|
return err;
|
2009-04-23 17:31:40 -06:00
|
|
|
}
|
|
|
|
|
2009-04-23 17:31:32 -06:00
|
|
|
/*
|
|
|
|
* A transport listener is removed by writing a "-", it's transport
|
|
|
|
* name, and it's port number.
|
|
|
|
*/
|
|
|
|
static ssize_t __write_ports_delxprt(char *buf)
|
|
|
|
{
|
|
|
|
struct svc_xprt *xprt;
|
|
|
|
char transport[16];
|
|
|
|
int port;
|
|
|
|
|
|
|
|
if (sscanf(&buf[1], "%15s %4u", transport, &port) != 2)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2010-05-24 15:33:03 -06:00
|
|
|
if (port < 1 || port > USHRT_MAX || nfsd_serv == NULL)
|
2009-04-23 17:31:32 -06:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
xprt = svc_find_xprt(nfsd_serv, transport, AF_UNSPEC, port);
|
|
|
|
if (xprt == NULL)
|
|
|
|
return -ENOTCONN;
|
|
|
|
|
|
|
|
svc_close_xprt(xprt);
|
|
|
|
svc_xprt_put(xprt);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-06-10 06:40:35 -06:00
|
|
|
static ssize_t __write_ports(struct file *file, char *buf, size_t size)
|
2006-10-02 03:17:47 -06:00
|
|
|
{
|
2009-04-23 17:32:10 -06:00
|
|
|
if (size == 0)
|
|
|
|
return __write_ports_names(buf);
|
2009-04-23 17:31:55 -06:00
|
|
|
|
|
|
|
if (isdigit(buf[0]))
|
|
|
|
return __write_ports_addfd(buf);
|
2009-04-23 17:31:48 -06:00
|
|
|
|
|
|
|
if (buf[0] == '-' && isdigit(buf[1]))
|
|
|
|
return __write_ports_delfd(buf);
|
2009-04-23 17:31:40 -06:00
|
|
|
|
|
|
|
if (isalpha(buf[0]))
|
|
|
|
return __write_ports_addxprt(buf);
|
2009-04-23 17:31:32 -06:00
|
|
|
|
|
|
|
if (buf[0] == '-' && isalpha(buf[1]))
|
|
|
|
return __write_ports_delxprt(buf);
|
|
|
|
|
2006-10-02 03:17:48 -06:00
|
|
|
return -EINVAL;
|
2006-10-02 03:17:47 -06:00
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_ports - Pass a socket file descriptor or transport name to listen on
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: ignored
|
|
|
|
* size: zero
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with a '\n'-terminated C
|
|
|
|
* string containing a whitespace-separated list of
|
|
|
|
* named NFSD listeners;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is zero or a negative errno value
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing an unsigned
|
|
|
|
* integer value representing a bound
|
|
|
|
* but unconnected socket that is to be
|
2009-04-23 17:32:03 -06:00
|
|
|
* used as an NFSD listener; listen(3)
|
|
|
|
* must be called for a SOCK_STREAM
|
|
|
|
* socket, otherwise it is ignored
|
2008-12-12 14:57:35 -07:00
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: NFS service is started;
|
|
|
|
* passed-in buffer filled with a '\n'-terminated C
|
|
|
|
* string containing a unique alphanumeric name of
|
|
|
|
* the listener;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is a negative errno value
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing a "-" followed
|
|
|
|
* by an integer value representing a
|
|
|
|
* previously passed in socket file
|
|
|
|
* descriptor
|
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: NFS service no longer listens on that socket;
|
|
|
|
* passed-in buffer filled with a '\n'-terminated C
|
|
|
|
* string containing a unique name of the listener;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is a negative errno value
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing a transport
|
|
|
|
* name and an unsigned integer value
|
|
|
|
* representing the port to listen on,
|
|
|
|
* separated by whitespace
|
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: returns zero; NFS service is started
|
|
|
|
* On error: return code is a negative errno value
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing a "-" followed
|
|
|
|
* by a transport name and an unsigned
|
|
|
|
* integer value representing the port
|
|
|
|
* to listen on, separated by whitespace
|
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: returns zero; NFS service no longer listens
|
|
|
|
* on that transport
|
|
|
|
* On error: return code is a negative errno value
|
|
|
|
*/
|
2008-06-10 06:40:35 -06:00
|
|
|
static ssize_t write_ports(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
ssize_t rv;
|
2008-06-10 06:40:36 -06:00
|
|
|
|
2008-06-10 06:40:35 -06:00
|
|
|
mutex_lock(&nfsd_mutex);
|
|
|
|
rv = __write_ports(file, buf, size);
|
|
|
|
mutex_unlock(&nfsd_mutex);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-04 03:15:48 -06:00
|
|
|
int nfsd_max_blksize;
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_maxblksize - Set or report the current NFS blksize
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: ignored
|
|
|
|
* size: zero
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing an unsigned
|
|
|
|
* integer value representing the new
|
|
|
|
* NFS blksize
|
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with '\n'-terminated C string
|
|
|
|
* containing numeric value of the current NFS blksize
|
|
|
|
* setting;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is zero or a negative errno value
|
|
|
|
*/
|
2006-10-04 03:15:48 -06:00
|
|
|
static ssize_t write_maxblksize(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
char *mesg = buf;
|
|
|
|
if (size > 0) {
|
|
|
|
int bsize;
|
|
|
|
int rv = get_int(&mesg, &bsize);
|
|
|
|
if (rv)
|
|
|
|
return rv;
|
|
|
|
/* force bsize into allowed range and
|
|
|
|
* required alignment.
|
|
|
|
*/
|
|
|
|
if (bsize < 1024)
|
|
|
|
bsize = 1024;
|
|
|
|
if (bsize > NFSSVC_MAXBLKSIZE)
|
|
|
|
bsize = NFSSVC_MAXBLKSIZE;
|
|
|
|
bsize &= ~(1024-1);
|
2008-06-10 06:40:35 -06:00
|
|
|
mutex_lock(&nfsd_mutex);
|
2006-10-04 03:15:48 -06:00
|
|
|
if (nfsd_serv && nfsd_serv->sv_nrthreads) {
|
2008-06-10 06:40:35 -06:00
|
|
|
mutex_unlock(&nfsd_mutex);
|
2006-10-04 03:15:48 -06:00
|
|
|
return -EBUSY;
|
|
|
|
}
|
|
|
|
nfsd_max_blksize = bsize;
|
2008-06-10 06:40:35 -06:00
|
|
|
mutex_unlock(&nfsd_mutex);
|
2006-10-04 03:15:48 -06:00
|
|
|
}
|
2009-04-23 17:33:25 -06:00
|
|
|
|
|
|
|
return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%d\n",
|
|
|
|
nfsd_max_blksize);
|
2006-10-04 03:15:48 -06:00
|
|
|
}
|
|
|
|
|
2005-11-07 02:00:25 -07:00
|
|
|
#ifdef CONFIG_NFSD_V4
|
2010-03-01 17:32:36 -07:00
|
|
|
static ssize_t __nfsd4_write_time(struct file *file, char *buf, size_t size, time_t *time)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
char *mesg = buf;
|
2010-03-01 17:32:36 -07:00
|
|
|
int rv, i;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
if (size > 0) {
|
2008-06-10 06:40:36 -06:00
|
|
|
if (nfsd_serv)
|
|
|
|
return -EBUSY;
|
2010-03-01 17:32:36 -07:00
|
|
|
rv = get_int(&mesg, &i);
|
2005-04-16 16:20:36 -06:00
|
|
|
if (rv)
|
|
|
|
return rv;
|
2010-03-02 09:18:40 -07:00
|
|
|
/*
|
|
|
|
* Some sanity checking. We don't have a reason for
|
|
|
|
* these particular numbers, but problems with the
|
|
|
|
* extremes are:
|
|
|
|
* - Too short: the briefest network outage may
|
|
|
|
* cause clients to lose all their locks. Also,
|
|
|
|
* the frequent polling may be wasteful.
|
|
|
|
* - Too long: do you really want reboot recovery
|
|
|
|
* to take more than an hour? Or to make other
|
|
|
|
* clients wait an hour before being able to
|
|
|
|
* revoke a dead client's locks?
|
|
|
|
*/
|
2010-03-01 17:32:36 -07:00
|
|
|
if (i < 10 || i > 3600)
|
2005-04-16 16:20:36 -06:00
|
|
|
return -EINVAL;
|
2010-03-01 17:32:36 -07:00
|
|
|
*time = i;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2009-04-23 17:33:25 -06:00
|
|
|
|
2010-03-01 17:32:36 -07:00
|
|
|
return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%ld\n", *time);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t nfsd4_write_time(struct file *file, char *buf, size_t size, time_t *time)
|
|
|
|
{
|
|
|
|
ssize_t rv;
|
|
|
|
|
|
|
|
mutex_lock(&nfsd_mutex);
|
|
|
|
rv = __nfsd4_write_time(file, buf, size, time);
|
|
|
|
mutex_unlock(&nfsd_mutex);
|
|
|
|
return rv;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_leasetime - Set or report the current NFSv4 lease time
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: ignored
|
|
|
|
* size: zero
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing an unsigned
|
|
|
|
* integer value representing the new
|
|
|
|
* NFSv4 lease expiry time
|
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with '\n'-terminated C
|
|
|
|
* string containing unsigned integer value of the
|
|
|
|
* current lease expiry time;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is zero or a negative errno value
|
|
|
|
*/
|
2008-06-10 06:40:36 -06:00
|
|
|
static ssize_t write_leasetime(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
2010-03-01 17:32:36 -07:00
|
|
|
return nfsd4_write_time(file, buf, size, &nfsd4_lease);
|
2008-06-10 06:40:36 -06:00
|
|
|
}
|
|
|
|
|
2010-03-02 09:04:06 -07:00
|
|
|
/**
|
|
|
|
* write_gracetime - Set or report current NFSv4 grace period time
|
|
|
|
*
|
|
|
|
* As above, but sets the time of the NFSv4 grace period.
|
|
|
|
*
|
|
|
|
* Note this should never be set to less than the *previous*
|
|
|
|
* lease-period time, but we don't try to enforce this. (In the common
|
|
|
|
* case (a new boot), we don't know what the previous lease time was
|
|
|
|
* anyway.)
|
|
|
|
*/
|
|
|
|
static ssize_t write_gracetime(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
return nfsd4_write_time(file, buf, size, &nfsd4_grace);
|
|
|
|
}
|
|
|
|
|
2008-06-10 06:40:36 -06:00
|
|
|
extern char *nfs4_recoverydir(void);
|
|
|
|
|
|
|
|
static ssize_t __write_recoverydir(struct file *file, char *buf, size_t size)
|
2005-06-23 23:04:32 -06:00
|
|
|
{
|
|
|
|
char *mesg = buf;
|
|
|
|
char *recdir;
|
|
|
|
int len, status;
|
|
|
|
|
2008-06-10 06:40:36 -06:00
|
|
|
if (size > 0) {
|
|
|
|
if (nfsd_serv)
|
|
|
|
return -EBUSY;
|
|
|
|
if (size > PATH_MAX || buf[size-1] != '\n')
|
|
|
|
return -EINVAL;
|
|
|
|
buf[size-1] = 0;
|
2005-06-23 23:04:32 -06:00
|
|
|
|
2008-06-10 06:40:36 -06:00
|
|
|
recdir = mesg;
|
|
|
|
len = qword_get(&mesg, recdir, size);
|
|
|
|
if (len <= 0)
|
|
|
|
return -EINVAL;
|
2005-06-23 23:04:32 -06:00
|
|
|
|
2008-06-10 06:40:36 -06:00
|
|
|
status = nfs4_reset_recoverydir(recdir);
|
|
|
|
}
|
2009-04-23 17:33:10 -06:00
|
|
|
|
|
|
|
return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%s\n",
|
|
|
|
nfs4_recoverydir());
|
2005-06-23 23:04:32 -06:00
|
|
|
}
|
2008-06-10 06:40:36 -06:00
|
|
|
|
2008-12-12 14:57:35 -07:00
|
|
|
/**
|
|
|
|
* write_recoverydir - Set or report the pathname of the recovery directory
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: ignored
|
|
|
|
* size: zero
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* Input:
|
|
|
|
* buf: C string containing the pathname
|
|
|
|
* of the directory on a local file
|
|
|
|
* system containing permanent NFSv4
|
|
|
|
* recovery data
|
|
|
|
* size: non-zero length of C string in @buf
|
|
|
|
* Output:
|
|
|
|
* On success: passed-in buffer filled with '\n'-terminated C string
|
|
|
|
* containing the current recovery pathname setting;
|
|
|
|
* return code is the size in bytes of the string
|
|
|
|
* On error: return code is zero or a negative errno value
|
|
|
|
*/
|
2008-06-10 06:40:36 -06:00
|
|
|
static ssize_t write_recoverydir(struct file *file, char *buf, size_t size)
|
|
|
|
{
|
|
|
|
ssize_t rv;
|
|
|
|
|
|
|
|
mutex_lock(&nfsd_mutex);
|
|
|
|
rv = __write_recoverydir(file, buf, size);
|
|
|
|
mutex_unlock(&nfsd_mutex);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2005-11-07 02:00:25 -07:00
|
|
|
#endif
|
2005-06-23 23:04:32 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*----------------------------------------------------------------------------*/
|
|
|
|
/*
|
|
|
|
* populating the filesystem.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int nfsd_fill_super(struct super_block * sb, void * data, int silent)
|
|
|
|
{
|
|
|
|
static struct tree_descr nfsd_files[] = {
|
|
|
|
[NFSD_Svc] = {".svc", &transaction_ops, S_IWUSR},
|
|
|
|
[NFSD_Add] = {".add", &transaction_ops, S_IWUSR},
|
|
|
|
[NFSD_Del] = {".del", &transaction_ops, S_IWUSR},
|
|
|
|
[NFSD_Export] = {".export", &transaction_ops, S_IWUSR},
|
|
|
|
[NFSD_Unexport] = {".unexport", &transaction_ops, S_IWUSR},
|
|
|
|
[NFSD_Getfd] = {".getfd", &transaction_ops, S_IWUSR|S_IRUSR},
|
|
|
|
[NFSD_Getfs] = {".getfs", &transaction_ops, S_IWUSR|S_IRUSR},
|
|
|
|
[NFSD_List] = {"exports", &exports_operations, S_IRUGO},
|
2009-12-14 10:53:32 -07:00
|
|
|
[NFSD_Export_features] = {"export_features",
|
|
|
|
&export_features_operations, S_IRUGO},
|
lockd: unlock lockd locks associated with a given server ip
For high-availability NFS service, we generally need to be able to drop
file locks held on the exported filesystem before moving clients to a
new server. Currently the only way to do that is by shutting down lockd
entirely, which is often undesireable (for example, if you want to
continue exporting other filesystems).
This patch allows the administrator to release all locks held by clients
accessing the client through a given server ip address, by echoing that
address to a new file, /proc/fs/nfsd/unlock_ip, as in:
shell> echo 10.1.1.2 > /proc/fs/nfsd/unlock_ip
The expected sequence of events can be:
1. Tear down the IP address
2. Unexport the path
3. Write IP to /proc/fs/nfsd/unlock_ip to unlock files
4. Signal peer to begin take-over.
For now we only support IPv4 addresses and NFSv2/v3 (NFSv4 locks are not
affected).
Also, if unmounting the filesystem is required, we assume at step 3 that
clients using the given server ip are the only clients holding locks on
the given filesystem; otherwise, an additional patch is required to
allow revoking all locks held by lockd on a given filesystem.
Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Cc: Lon Hohberger <lhh@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
fs/lockd/svcsubs.c | 66 +++++++++++++++++++++++++++++++++++++++-----
fs/nfsd/nfsctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++
include/linux/lockd/lockd.h | 7 ++++
3 files changed, 131 insertions(+), 7 deletions(-)
2008-01-17 09:10:12 -07:00
|
|
|
[NFSD_FO_UnlockIP] = {"unlock_ip",
|
|
|
|
&transaction_ops, S_IWUSR|S_IRUSR},
|
2008-01-17 09:10:12 -07:00
|
|
|
[NFSD_FO_UnlockFS] = {"unlock_filesystem",
|
|
|
|
&transaction_ops, S_IWUSR|S_IRUSR},
|
2005-04-16 16:20:36 -06:00
|
|
|
[NFSD_Fh] = {"filehandle", &transaction_ops, S_IWUSR|S_IRUSR},
|
|
|
|
[NFSD_Threads] = {"threads", &transaction_ops, S_IWUSR|S_IRUSR},
|
2006-10-02 03:18:02 -06:00
|
|
|
[NFSD_Pool_Threads] = {"pool_threads", &transaction_ops, S_IWUSR|S_IRUSR},
|
2009-01-13 03:26:36 -07:00
|
|
|
[NFSD_Pool_Stats] = {"pool_stats", &pool_stats_operations, S_IRUGO},
|
2005-11-07 02:00:25 -07:00
|
|
|
[NFSD_Versions] = {"versions", &transaction_ops, S_IWUSR|S_IRUSR},
|
2006-10-02 03:17:47 -06:00
|
|
|
[NFSD_Ports] = {"portlist", &transaction_ops, S_IWUSR|S_IRUGO},
|
2006-10-04 03:15:48 -06:00
|
|
|
[NFSD_MaxBlkSize] = {"max_block_size", &transaction_ops, S_IWUSR|S_IRUGO},
|
2005-04-16 16:20:36 -06:00
|
|
|
#ifdef CONFIG_NFSD_V4
|
|
|
|
[NFSD_Leasetime] = {"nfsv4leasetime", &transaction_ops, S_IWUSR|S_IRUSR},
|
2010-03-02 09:04:06 -07:00
|
|
|
[NFSD_Gracetime] = {"nfsv4gracetime", &transaction_ops, S_IWUSR|S_IRUSR},
|
2005-06-23 23:04:32 -06:00
|
|
|
[NFSD_RecoveryDir] = {"nfsv4recoverydir", &transaction_ops, S_IWUSR|S_IRUSR},
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif
|
|
|
|
/* last one */ {""}
|
|
|
|
};
|
|
|
|
return simple_fill_super(sb, 0x6e667364, nfsd_files);
|
|
|
|
}
|
|
|
|
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 03:02:57 -06:00
|
|
|
static int nfsd_get_sb(struct file_system_type *fs_type,
|
|
|
|
int flags, const char *dev_name, void *data, struct vfsmount *mnt)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 03:02:57 -06:00
|
|
|
return get_sb_single(fs_type, flags, data, nfsd_fill_super, mnt);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct file_system_type nfsd_fs_type = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.name = "nfsd",
|
|
|
|
.get_sb = nfsd_get_sb,
|
|
|
|
.kill_sb = kill_litter_super,
|
|
|
|
};
|
|
|
|
|
2007-11-12 15:32:21 -07:00
|
|
|
#ifdef CONFIG_PROC_FS
|
|
|
|
static int create_proc_exports_entry(void)
|
|
|
|
{
|
|
|
|
struct proc_dir_entry *entry;
|
|
|
|
|
|
|
|
entry = proc_mkdir("fs/nfs", NULL);
|
|
|
|
if (!entry)
|
|
|
|
return -ENOMEM;
|
2008-04-29 02:02:04 -06:00
|
|
|
entry = proc_create("exports", 0, entry, &exports_operations);
|
2007-11-12 15:32:21 -07:00
|
|
|
if (!entry)
|
|
|
|
return -ENOMEM;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else /* CONFIG_PROC_FS */
|
|
|
|
static int create_proc_exports_entry(void)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
static int __init init_nfsd(void)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
printk(KERN_INFO "Installing knfsd (copyright (C) 1996 okir@monad.swb.de).\n");
|
|
|
|
|
2007-08-01 13:30:59 -06:00
|
|
|
retval = nfs4_state_init(); /* nfs4 locking state */
|
|
|
|
if (retval)
|
|
|
|
return retval;
|
2005-04-16 16:20:36 -06:00
|
|
|
nfsd_stat_init(); /* Statistics */
|
2007-11-09 12:10:56 -07:00
|
|
|
retval = nfsd_reply_cache_init();
|
|
|
|
if (retval)
|
|
|
|
goto out_free_stat;
|
2007-11-08 15:20:34 -07:00
|
|
|
retval = nfsd_export_init();
|
|
|
|
if (retval)
|
|
|
|
goto out_free_cache;
|
2005-04-16 16:20:36 -06:00
|
|
|
nfsd_lockd_init(); /* lockd->nfsd callbacks */
|
2007-11-08 15:20:34 -07:00
|
|
|
retval = nfsd_idmap_init();
|
|
|
|
if (retval)
|
|
|
|
goto out_free_lockd;
|
2007-11-12 15:32:21 -07:00
|
|
|
retval = create_proc_exports_entry();
|
|
|
|
if (retval)
|
|
|
|
goto out_free_idmap;
|
2005-04-16 16:20:36 -06:00
|
|
|
retval = register_filesystem(&nfsd_fs_type);
|
2007-11-09 11:44:06 -07:00
|
|
|
if (retval)
|
|
|
|
goto out_free_all;
|
|
|
|
return 0;
|
|
|
|
out_free_all:
|
|
|
|
remove_proc_entry("fs/nfs/exports", NULL);
|
|
|
|
remove_proc_entry("fs/nfs", NULL);
|
2007-11-12 15:32:21 -07:00
|
|
|
out_free_idmap:
|
2007-11-08 15:20:34 -07:00
|
|
|
nfsd_idmap_shutdown();
|
|
|
|
out_free_lockd:
|
2007-11-09 11:44:06 -07:00
|
|
|
nfsd_lockd_shutdown();
|
2007-11-12 15:32:21 -07:00
|
|
|
nfsd_export_shutdown();
|
2007-11-08 15:20:34 -07:00
|
|
|
out_free_cache:
|
2007-11-12 15:32:21 -07:00
|
|
|
nfsd_reply_cache_shutdown();
|
2007-11-09 12:10:56 -07:00
|
|
|
out_free_stat:
|
|
|
|
nfsd_stat_shutdown();
|
2007-11-09 11:44:06 -07:00
|
|
|
nfsd4_free_slabs();
|
2005-04-16 16:20:36 -06:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit exit_nfsd(void)
|
|
|
|
{
|
|
|
|
nfsd_export_shutdown();
|
2007-11-09 12:10:56 -07:00
|
|
|
nfsd_reply_cache_shutdown();
|
2005-04-16 16:20:36 -06:00
|
|
|
remove_proc_entry("fs/nfs/exports", NULL);
|
|
|
|
remove_proc_entry("fs/nfs", NULL);
|
|
|
|
nfsd_stat_shutdown();
|
|
|
|
nfsd_lockd_shutdown();
|
|
|
|
nfsd_idmap_shutdown();
|
2007-08-01 13:30:59 -06:00
|
|
|
nfsd4_free_slabs();
|
2005-04-16 16:20:36 -06:00
|
|
|
unregister_filesystem(&nfsd_fs_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
module_init(init_nfsd)
|
|
|
|
module_exit(exit_nfsd)
|