Date: Sun, 17 May 2009 17:54:01 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r192255 - head/sys/fs/nfsserver Message-ID: <200905171754.n4HHs1lU035649@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Sun May 17 17:54:01 2009 New Revision: 192255 URL: http://svn.freebsd.org/changeset/base/192255 Log: Added a SYSCTL to sys/fs/nfsserver/nfs_nfsdport.c so that the value of nfsrv_dolocallocks can be changed via sysctl. I also added some non-empty descriptor strings and reformatted some overly long lines. Approved by: kib (mentor) Modified: head/sys/fs/nfsserver/nfs_nfsdport.c Modified: head/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdport.c Sun May 17 17:52:35 2009 (r192254) +++ head/sys/fs/nfsserver/nfs_nfsdport.c Sun May 17 17:54:01 2009 (r192255) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include <fs/nfs/nfsport.h> #include <sys/sysctl.h> -extern int nfsrv_dolocallocks; extern u_int32_t newnfs_true, newnfs_false, newnfs_xdrneg1; extern int nfsv4root_set; extern int nfsrv_useacl; @@ -58,17 +57,26 @@ struct mtx nfs_v4root_mutex; struct nfsrvfh nfs_rootfh, nfs_pubfh; int nfs_pubfhset = 0, nfs_rootfhset = 0; -static int nfssvc_srvcall(struct thread *, struct nfssvc_args *, struct ucred *); +static int nfssvc_srvcall(struct thread *, struct nfssvc_args *, + struct ucred *); static int enable_crossmntpt = 1; static int nfs_commit_blks; static int nfs_commit_miss; extern int nfsrv_issuedelegs; +extern int nfsrv_dolocallocks; + SYSCTL_DECL(_vfs_newnfs); -SYSCTL_INT(_vfs_newnfs, OID_AUTO, mirrormnt, CTLFLAG_RW, &enable_crossmntpt, 0, ""); -SYSCTL_INT(_vfs_newnfs, OID_AUTO, commit_blks, CTLFLAG_RW, &nfs_commit_blks, 0, ""); -SYSCTL_INT(_vfs_newnfs, OID_AUTO, commit_miss, CTLFLAG_RW, &nfs_commit_miss, 0, ""); -SYSCTL_INT(_vfs_newnfs, OID_AUTO, issue_delegations, CTLFLAG_RW, &nfsrv_issuedelegs, 0, ""); +SYSCTL_INT(_vfs_newnfs, OID_AUTO, mirrormnt, CTLFLAG_RW, &enable_crossmntpt, + 0, "Enable nfsd to cross mount points"); +SYSCTL_INT(_vfs_newnfs, OID_AUTO, commit_blks, CTLFLAG_RW, &nfs_commit_blks, + 0, ""); +SYSCTL_INT(_vfs_newnfs, OID_AUTO, commit_miss, CTLFLAG_RW, &nfs_commit_miss, + 0, ""); +SYSCTL_INT(_vfs_newnfs, OID_AUTO, issue_delegations, CTLFLAG_RW, + &nfsrv_issuedelegs, 0, "Enable nfsd to issue delegations"); +SYSCTL_INT(_vfs_newnfs, OID_AUTO, enable_locallocks, CTLFLAG_RW, + &nfsrv_dolocallocks, 0, "Enable nfsd to acquire local locks on files"); #define NUM_HEURISTIC 1017 #define NHUSE_INIT 64
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905171754.n4HHs1lU035649>