Module Name: src
Committed By: dholland
Date: Wed Feb 1 05:43:55 UTC 2012
Modified Files:
src/lib/libquota: quota_kernel.c
src/sys/compat/netbsd32: netbsd32.h netbsd32_netbsd.c
src/sys/kern: vfs_quotactl.c vfs_syscalls.c
src/sys/sys: quotactl.h
src/sys/ufs/ufs: ufs_quota.c ufs_quota1.c ufs_quota2.c
Log Message:
Improve the names of some members of struct quotactl_args. These are
effectively function parameter names, but since they need to be
described with the same names in the man page the choices do matter.
Some.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libquota/quota_kernel.c
cvs rdiff -u -r1.90 -r1.91 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.178 -r1.179 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.37 -r1.38 src/sys/kern/vfs_quotactl.c
cvs rdiff -u -r1.445 -r1.446 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.33 -r1.34 src/sys/sys/quotactl.h
cvs rdiff -u -r1.107 -r1.108 src/sys/ufs/ufs/ufs_quota.c
cvs rdiff -u -r1.16 -r1.17 src/sys/ufs/ufs/ufs_quota1.c
cvs rdiff -u -r1.31 -r1.32 src/sys/ufs/ufs/ufs_quota2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libquota/quota_kernel.c
diff -u src/lib/libquota/quota_kernel.c:1.1 src/lib/libquota/quota_kernel.c:1.2
--- src/lib/libquota/quota_kernel.c:1.1 Wed Feb 1 05:34:40 2012
+++ src/lib/libquota/quota_kernel.c Wed Feb 1 05:43:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quota_kernel.c,v 1.1 2012/02/01 05:34:40 dholland Exp $ */
+/* $NetBSD: quota_kernel.c,v 1.2 2012/02/01 05:43:53 dholland Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: quota_kernel.c,v 1.1 2012/02/01 05:34:40 dholland Exp $");
+__RCSID("$NetBSD: quota_kernel.c,v 1.2 2012/02/01 05:43:53 dholland Exp $");
#include <stdlib.h>
#include <err.h>
@@ -52,7 +52,7 @@ __quota_kernel_stat(struct quotahandle *
struct quotactl_args args;
args.qc_op = QUOTACTL_STAT;
- args.u.stat.qc_ret = stat;
+ args.u.stat.qc_info = stat;
return __quotactl(qh->qh_mountpoint, &args);
}
@@ -199,7 +199,7 @@ __quota_kernel_get(struct quotahandle *q
args.qc_op = QUOTACTL_GET;
args.u.get.qc_key = qk;
- args.u.get.qc_ret = qv;
+ args.u.get.qc_val = qv;
return __quotactl(qh->qh_mountpoint, &args);
}
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.90 src/sys/compat/netbsd32/netbsd32.h:1.91
--- src/sys/compat/netbsd32/netbsd32.h:1.90 Wed Feb 1 05:40:00 2012
+++ src/sys/compat/netbsd32/netbsd32.h Wed Feb 1 05:43:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.90 2012/02/01 05:40:00 dholland Exp $ */
+/* $NetBSD: netbsd32.h,v 1.91 2012/02/01 05:43:54 dholland Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -274,7 +274,7 @@ struct netbsd32_quotactlargs {
unsigned qc_op;
union {
struct {
- netbsd32_pointer_t qc_ret;
+ netbsd32_pointer_t qc_info;
} stat;
struct {
int qc_idtype;
@@ -286,7 +286,7 @@ struct netbsd32_quotactlargs {
} objtypestat;
struct {
netbsd32_pointer_t qc_key;
- netbsd32_pointer_t qc_ret;
+ netbsd32_pointer_t qc_val;
} get;
struct {
netbsd32_pointer_t qc_key;
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.178 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.179
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.178 Wed Feb 1 05:40:00 2012
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Wed Feb 1 05:43:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.178 2012/02/01 05:40:00 dholland Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.179 2012/02/01 05:43:54 dholland Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.178 2012/02/01 05:40:00 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.179 2012/02/01 05:43:54 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -1204,7 +1204,7 @@ netbsd32___quotactl(struct lwp *l, const
args.qc_op = args32.qc_op;
switch (args.qc_op) {
case QUOTACTL_STAT:
- args.u.stat.qc_ret = NETBSD32PTR64(args32.u.stat.qc_ret);
+ args.u.stat.qc_info = NETBSD32PTR64(args32.u.stat.qc_info);
break;
case QUOTACTL_IDTYPESTAT:
args.u.idtypestat.qc_idtype = args32.u.idtypestat.qc_idtype;
@@ -1219,7 +1219,7 @@ netbsd32___quotactl(struct lwp *l, const
break;
case QUOTACTL_GET:
args.u.get.qc_key = NETBSD32PTR64(args32.u.get.qc_key);
- args.u.get.qc_ret = NETBSD32PTR64(args32.u.get.qc_ret);
+ args.u.get.qc_val = NETBSD32PTR64(args32.u.get.qc_val);
break;
case QUOTACTL_PUT:
args.u.put.qc_key = NETBSD32PTR64(args32.u.put.qc_key);
Index: src/sys/kern/vfs_quotactl.c
diff -u src/sys/kern/vfs_quotactl.c:1.37 src/sys/kern/vfs_quotactl.c:1.38
--- src/sys/kern/vfs_quotactl.c:1.37 Wed Feb 1 05:34:41 2012
+++ src/sys/kern/vfs_quotactl.c Wed Feb 1 05:43:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_quotactl.c,v 1.37 2012/02/01 05:34:41 dholland Exp $ */
+/* $NetBSD: vfs_quotactl.c,v 1.38 2012/02/01 05:43:54 dholland Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.37 2012/02/01 05:34:41 dholland Exp $$");
+__KERNEL_RCSID(0, "$NetBSD: vfs_quotactl.c,v 1.38 2012/02/01 05:43:54 dholland Exp $$");
#include <sys/mount.h>
#include <sys/quotactl.h>
@@ -40,7 +40,7 @@ vfs_quotactl_stat(struct mount *mp, stru
struct quotactl_args args;
args.qc_op = QUOTACTL_STAT;
- args.u.stat.qc_ret = info;
+ args.u.stat.qc_info = info;
return VFS_QUOTACTL(mp, &args);
}
@@ -76,7 +76,7 @@ vfs_quotactl_get(struct mount *mp, const
args.qc_op = QUOTACTL_GET;
args.u.get.qc_key = key;
- args.u.get.qc_ret = val;
+ args.u.get.qc_val = val;
return VFS_QUOTACTL(mp, &args);
}
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.445 src/sys/kern/vfs_syscalls.c:1.446
--- src/sys/kern/vfs_syscalls.c:1.445 Wed Feb 1 05:39:28 2012
+++ src/sys/kern/vfs_syscalls.c Wed Feb 1 05:43:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.445 2012/02/01 05:39:28 dholland Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.446 2012/02/01 05:43:54 dholland Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.445 2012/02/01 05:39:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.446 2012/02/01 05:43:54 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -921,7 +921,7 @@ do_sys_quotactl(const char *path_u, cons
switch (args->qc_op) {
case QUOTACTL_STAT:
- error = do_sys_quotactl_stat(mp, args->u.stat.qc_ret);
+ error = do_sys_quotactl_stat(mp, args->u.stat.qc_info);
break;
case QUOTACTL_IDTYPESTAT:
error = do_sys_quotactl_idtypestat(mp,
@@ -936,7 +936,7 @@ do_sys_quotactl(const char *path_u, cons
case QUOTACTL_GET:
error = do_sys_quotactl_get(mp,
args->u.get.qc_key,
- args->u.get.qc_ret);
+ args->u.get.qc_val);
break;
case QUOTACTL_PUT:
error = do_sys_quotactl_put(mp,
Index: src/sys/sys/quotactl.h
diff -u src/sys/sys/quotactl.h:1.33 src/sys/sys/quotactl.h:1.34
--- src/sys/sys/quotactl.h:1.33 Wed Feb 1 05:34:42 2012
+++ src/sys/sys/quotactl.h Wed Feb 1 05:43:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quotactl.h,v 1.33 2012/02/01 05:34:42 dholland Exp $ */
+/* $NetBSD: quotactl.h,v 1.34 2012/02/01 05:43:54 dholland Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -98,7 +98,7 @@ struct quotactl_args {
unsigned qc_op;
union {
struct {
- struct quotastat *qc_ret;
+ struct quotastat *qc_info;
} stat;
struct {
int qc_idtype;
@@ -110,7 +110,7 @@ struct quotactl_args {
} objtypestat;
struct {
const struct quotakey *qc_key;
- struct quotaval *qc_ret;
+ struct quotaval *qc_val;
} get;
struct {
const struct quotakey *qc_key;
Index: src/sys/ufs/ufs/ufs_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.107 src/sys/ufs/ufs/ufs_quota.c:1.108
--- src/sys/ufs/ufs/ufs_quota.c:1.107 Wed Feb 1 05:34:43 2012
+++ src/sys/ufs/ufs/ufs_quota.c Wed Feb 1 05:43:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.c,v 1.107 2012/02/01 05:34:43 dholland Exp $ */
+/* $NetBSD: ufs_quota.c,v 1.108 2012/02/01 05:43:54 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.107 2012/02/01 05:34:43 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.108 2012/02/01 05:43:54 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -227,32 +227,32 @@ quota_handle_cmd_stat(struct mount *mp,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
- struct quotastat *ret;
+ struct quotastat *info;
KASSERT(args->qc_op == QUOTACTL_STAT);
- ret = args->u.stat.qc_ret;
+ info = args->u.stat.qc_info;
if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
return EOPNOTSUPP;
#ifdef QUOTA
if (ump->um_flags & UFS_QUOTA) {
- strcpy(ret->qs_implname, "ufs/ffs quota v1");
- ret->qs_numidtypes = MAXQUOTAS;
+ strcpy(info->qs_implname, "ufs/ffs quota v1");
+ info->qs_numidtypes = MAXQUOTAS;
/* XXX no define for this */
- ret->qs_numobjtypes = 2;
- ret->qs_restrictions = 0;
- ret->qs_restrictions |= QUOTA_RESTRICT_NEEDSQUOTACHECK;
- ret->qs_restrictions |= QUOTA_RESTRICT_UNIFORMGRACE;
- ret->qs_restrictions |= QUOTA_RESTRICT_32BIT;
+ info->qs_numobjtypes = 2;
+ info->qs_restrictions = 0;
+ info->qs_restrictions |= QUOTA_RESTRICT_NEEDSQUOTACHECK;
+ info->qs_restrictions |= QUOTA_RESTRICT_UNIFORMGRACE;
+ info->qs_restrictions |= QUOTA_RESTRICT_32BIT;
} else
#endif
#ifdef QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
- strcpy(ret->qs_implname, "ufs/ffs quota v2");
- ret->qs_numidtypes = MAXQUOTAS;
- ret->qs_numobjtypes = N_QL;
- ret->qs_restrictions = 0;
+ strcpy(info->qs_implname, "ufs/ffs quota v2");
+ info->qs_numidtypes = MAXQUOTAS;
+ info->qs_numobjtypes = N_QL;
+ info->qs_restrictions = 0;
} else
#endif
return EOPNOTSUPP;
@@ -347,11 +347,11 @@ quota_handle_cmd_get(struct mount *mp, s
struct ufsmount *ump = VFSTOUFS(mp);
int error;
const struct quotakey *qk;
- struct quotaval *ret;
+ struct quotaval *qv;
KASSERT(args->qc_op == QUOTACTL_GET);
qk = args->u.get.qc_key;
- ret = args->u.get.qc_ret;
+ qv = args->u.get.qc_val;
if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
return EOPNOTSUPP;
@@ -361,12 +361,12 @@ quota_handle_cmd_get(struct mount *mp, s
return error;
#ifdef QUOTA
if (ump->um_flags & UFS_QUOTA) {
- error = quota1_handle_cmd_get(ump, qk, ret);
+ error = quota1_handle_cmd_get(ump, qk, qv);
} else
#endif
#ifdef QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
- error = quota2_handle_cmd_get(ump, qk, ret);
+ error = quota2_handle_cmd_get(ump, qk, qv);
} else
#endif
panic("quota_handle_cmd_get: no support ?");
Index: src/sys/ufs/ufs/ufs_quota1.c
diff -u src/sys/ufs/ufs/ufs_quota1.c:1.16 src/sys/ufs/ufs/ufs_quota1.c:1.17
--- src/sys/ufs/ufs/ufs_quota1.c:1.16 Sun Jan 29 07:16:53 2012
+++ src/sys/ufs/ufs/ufs_quota1.c Wed Feb 1 05:43:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota1.c,v 1.16 2012/01/29 07:16:53 dholland Exp $ */
+/* $NetBSD: ufs_quota1.c,v 1.17 2012/02/01 05:43:54 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.16 2012/01/29 07:16:53 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.17 2012/02/01 05:43:54 dholland Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -493,7 +493,7 @@ again:
int
quota1_handle_cmd_get(struct ufsmount *ump, const struct quotakey *qk,
- struct quotaval *ret)
+ struct quotaval *qv)
{
struct dquot *dq;
int error;
@@ -530,10 +530,10 @@ quota1_handle_cmd_get(struct ufsmount *u
switch (qk->qk_objtype) {
case QUOTA_OBJTYPE_BLOCKS:
- *ret = blocks;
+ *qv = blocks;
break;
case QUOTA_OBJTYPE_FILES:
- *ret = files;
+ *qv = files;
break;
default:
return EINVAL;
Index: src/sys/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.31 src/sys/ufs/ufs/ufs_quota2.c:1.32
--- src/sys/ufs/ufs/ufs_quota2.c:1.31 Wed Feb 1 05:10:44 2012
+++ src/sys/ufs/ufs/ufs_quota2.c Wed Feb 1 05:43:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.31 2012/02/01 05:10:44 dholland Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.32 2012/02/01 05:43:54 dholland Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.31 2012/02/01 05:10:44 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.32 2012/02/01 05:43:54 dholland Exp $");
#include <sys/buf.h>
#include <sys/param.h>
@@ -867,7 +867,7 @@ quota2_fetch_quotaval(struct ufsmount *u
int
quota2_handle_cmd_get(struct ufsmount *ump, const struct quotakey *qk,
- struct quotaval *ret)
+ struct quotaval *qv)
{
int error;
struct quota2_header *q2h;
@@ -902,10 +902,10 @@ quota2_handle_cmd_get(struct ufsmount *u
mutex_exit(&dqlock);
brelse(bp, 0);
q2e_to_quotaval(&q2e, qk->qk_id == QUOTA_DEFAULTID, &id2,
- qk->qk_objtype, ret);
+ qk->qk_objtype, qv);
(void)id2;
} else
- error = quota2_fetch_quotaval(ump, qk, ret);
+ error = quota2_fetch_quotaval(ump, qk, qv);
return error;
}
