diff options
| author | alfred <alfred@FreeBSD.org> | 2001-11-12 02:33:52 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2001-11-12 02:33:52 +0000 |
| commit | fa9d19d5b5a167a7b50a018bacf9d0bf68db9491 (patch) | |
| tree | 661a9bb10d2313edc596f0373f96041cee806ac5 /sys/nfsclient/nfs_vfsops.c | |
| parent | bdcad4abe9842b7ce28d140987a31959a30d3665 (diff) | |
| download | FreeBSD-src-fa9d19d5b5a167a7b50a018bacf9d0bf68db9491.zip FreeBSD-src-fa9d19d5b5a167a7b50a018bacf9d0bf68db9491.tar.gz | |
Allow users to use the 'nolockd' or -L options with mount_nfs in order
to avoid the need for rpc.lockd to perform client locks. Using
this option a user can revert back to using local locks for NFS mounts
like we did before we had rpc.lockd.
Diffstat (limited to 'sys/nfsclient/nfs_vfsops.c')
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index e80adad..f49d56a 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -763,12 +763,12 @@ nfs_mount(struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, return (EIO); /* * When doing an update, we can't change from or to - * v3, or change cookie translation + * v3, switch lockd strategies or change cookie translation */ args.flags = (args.flags & - ~(NFSMNT_NFSV3 /*|NFSMNT_XLATECOOKIE*/)) | + ~(NFSMNT_NFSV3 | NFSMNT_NOLOCKD /*|NFSMNT_XLATECOOKIE*/)) | (nmp->nm_flag & - (NFSMNT_NFSV3 /*|NFSMNT_XLATECOOKIE*/)); + (NFSMNT_NFSV3 | NFSMNT_NOLOCKD /*|NFSMNT_XLATECOOKIE*/)); nfs_decode_args(nmp, &args); return (0); } |
