diff options
| author | NeilBrown <neilb@suse.de> | 2011-06-21 15:27:43 +1000 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-07-15 18:58:42 -0400 |
| commit | 49b28684fdba2c84a3b8e54aaa0faa9ce2e4f140 (patch) | |
| tree | c64ee1e754e291d5a917417b25026e681d8a3d0d /fs/nfsd/lockd.c | |
| parent | 094b5d74f4005ae1cc90688f2c814e00937809a8 (diff) | |
| download | linux-49b28684fdba2c84a3b8e54aaa0faa9ce2e4f140.tar.bz2 | |
nfsd: Remove deprecated nfsctl system call and related code.
As promised in feature-removal-schedule.txt it is time to
remove the nfsctl system call.
Userspace has perferred to not use this call throughout 2.6 and it has been
excluded in the default configuration since 2.6.36 (9 months ago).
So this patch removes all the code that was being compiled out.
There are still references to sys_nfsctl in various arch systemcall tables
and related code. These should be cleaned out too, probably in the next
merge window.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/lockd.c')
| -rw-r--r-- | fs/nfsd/lockd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c index 7c831a2731fa..77e7a5cca888 100644 --- a/fs/nfsd/lockd.c +++ b/fs/nfsd/lockd.c @@ -35,10 +35,8 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp) memcpy((char*)&fh.fh_handle.fh_base, f->data, f->size); fh.fh_export = NULL; - exp_readlock(); nfserr = nfsd_open(rqstp, &fh, S_IFREG, NFSD_MAY_LOCK, filp); fh_put(&fh); - exp_readunlock(); /* We return nlm error codes as nlm doesn't know * about nfsd, but nfsd does know about nlm.. */ |