24e36663c3
Currently lockd listens on UDP always, and TCP if CONFIG_NFSD_TCP is set. However as lockd performs services of the client as well, this is a problem. If CONFIG_NfSD_TCP is not set, and a tcp mount is used, the server will not be able to call back to lockd. So: - add an option to lockd_up saying which protocol is needed - Always open sockets for which an explicit port was given, otherwise only open a socket of the type required - Change nfsd to do one lockd_up per socket rather than one per thread. This - removes the dependancy on CONFIG_NFSD_TCP - means that lockd may open sockets other than at startup - means that lockd will *not* listen on UDP if the only mounts are TCP mount (and nfsd hasn't started). The latter is the only one that concerns me at all - I don't know if this might be a problem with some servers. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
37 lines
763 B
C
37 lines
763 B
C
/*
|
|
* linux/include/linux/lockd/bind.h
|
|
*
|
|
* This is the part of lockd visible to nfsd and the nfs client.
|
|
*
|
|
* Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
|
|
*/
|
|
|
|
#ifndef LINUX_LOCKD_BIND_H
|
|
#define LINUX_LOCKD_BIND_H
|
|
|
|
#include <linux/lockd/nlm.h>
|
|
|
|
/* Dummy declarations */
|
|
struct svc_rqst;
|
|
|
|
/*
|
|
* This is the set of functions for lockd->nfsd communication
|
|
*/
|
|
struct nlmsvc_binding {
|
|
u32 (*fopen)(struct svc_rqst *,
|
|
struct nfs_fh *,
|
|
struct file **);
|
|
void (*fclose)(struct file *);
|
|
};
|
|
|
|
extern struct nlmsvc_binding * nlmsvc_ops;
|
|
|
|
/*
|
|
* Functions exported by the lockd module
|
|
*/
|
|
extern int nlmclnt_proc(struct inode *, int, struct file_lock *);
|
|
extern int lockd_up(int proto);
|
|
extern void lockd_down(void);
|
|
|
|
#endif /* LINUX_LOCKD_BIND_H */
|