Module Name: src
Committed By: riastradh
Date: Wed Feb 22 21:49:45 UTC 2023
Modified Files:
src/sys/ufs/ufs: quota1_subr.c quota2.h quota2_subr.c ufs_acl.c
ufs_extattr.c ufs_lookup.c ufs_quota.c ufs_quota1.c ufs_quota2.c
ufs_vfsops.c
Log Message:
ufs: Nix trailing whitespace and tidy up some other minor KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/ufs/quota1_subr.c
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/ufs/quota2.h
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/ufs/quota2_subr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/ufs/ufs_acl.c
cvs rdiff -u -r1.53 -r1.54 src/sys/ufs/ufs/ufs_extattr.c
cvs rdiff -u -r1.156 -r1.157 src/sys/ufs/ufs/ufs_lookup.c
cvs rdiff -u -r1.117 -r1.118 src/sys/ufs/ufs/ufs_quota.c
cvs rdiff -u -r1.25 -r1.26 src/sys/ufs/ufs/ufs_quota1.c
cvs rdiff -u -r1.45 -r1.46 src/sys/ufs/ufs/ufs_quota2.c
cvs rdiff -u -r1.60 -r1.61 src/sys/ufs/ufs/ufs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ufs/quota1_subr.c
diff -u src/sys/ufs/ufs/quota1_subr.c:1.7 src/sys/ufs/ufs/quota1_subr.c:1.8
--- src/sys/ufs/ufs/quota1_subr.c:1.7 Sun Jan 29 06:23:20 2012
+++ src/sys/ufs/ufs/quota1_subr.c Wed Feb 22 21:49:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: quota1_subr.c,v 1.7 2012/01/29 06:23:20 dholland Exp $ */
+/* $NetBSD: quota1_subr.c,v 1.8 2023/02/22 21:49:45 riastradh Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: quota1_subr.c,v 1.7 2012/01/29 06:23:20 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: quota1_subr.c,v 1.8 2023/02/22 21:49:45 riastradh Exp $");
#include <sys/types.h>
#include <machine/limits.h>
@@ -54,7 +54,7 @@ q2e2dqblk_limit(uint64_t lim)
void
dqblk_to_quotavals(const struct dqblk *dqblk,
- struct quotaval *blocks, struct quotaval *files)
+ struct quotaval *blocks, struct quotaval *files)
{
/* XXX is qv_grace getting handled correctly? */
@@ -71,7 +71,7 @@ dqblk_to_quotavals(const struct dqblk *d
void
quotavals_to_dqblk(const struct quotaval *blocks, const struct quotaval *files,
- struct dqblk *dqblk)
+ struct dqblk *dqblk)
{
/* XXX is qv_grace getting handled correctly? */
@@ -85,4 +85,3 @@ quotavals_to_dqblk(const struct quotaval
dqblk->dqb_curinodes = files->qv_usage;
dqblk->dqb_itime = files->qv_expiretime;
}
-
Index: src/sys/ufs/ufs/quota2.h
diff -u src/sys/ufs/ufs/quota2.h:1.10 src/sys/ufs/ufs/quota2.h:1.11
--- src/sys/ufs/ufs/quota2.h:1.10 Wed Oct 25 18:06:01 2017
+++ src/sys/ufs/ufs/quota2.h Wed Feb 22 21:49:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2.h,v 1.10 2017/10/25 18:06:01 jdolecek Exp $ */
+/* $NetBSD: quota2.h,v 1.11 2023/02/22 21:49:45 riastradh Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -115,7 +115,7 @@ void quota2_ufs_rwq2e(const struct quota
#define QL_S_ALLOW_SOFT 0x01 /* over soft limit */
#define QL_S_DENY_GRACE 0x02 /* over soft limit, grace time expired */
#define QL_S_DENY_HARD 0x03 /* over hard limit */
-
+
#define QL_F_CROSS 0x80 /* crossing soft limit */
#define QL_STATUS(x) ((x) & 0x0f)
Index: src/sys/ufs/ufs/quota2_subr.c
diff -u src/sys/ufs/ufs/quota2_subr.c:1.5 src/sys/ufs/ufs/quota2_subr.c:1.6
--- src/sys/ufs/ufs/quota2_subr.c:1.5 Sun Feb 5 14:19:04 2012
+++ src/sys/ufs/ufs/quota2_subr.c Wed Feb 22 21:49:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2_subr.c,v 1.5 2012/02/05 14:19:04 dholland Exp $ */
+/* $NetBSD: quota2_subr.c,v 1.6 2023/02/22 21:49:45 riastradh Exp $ */
/*-
* Copyright (c) 2010, 2011 Manuel Bouyer
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.5 2012/02/05 14:19:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.6 2023/02/22 21:49:45 riastradh Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -87,7 +87,8 @@ quota2_create_blk0(uint64_t bsize, void
}
void
-quota2_ufs_rwq2v(const struct quota2_val *s, struct quota2_val *d, int needswap)
+quota2_ufs_rwq2v(const struct quota2_val *s, struct quota2_val *d,
+ int needswap)
{
d->q2v_hardlimit = ufs_rw64(s->q2v_hardlimit, needswap);
d->q2v_softlimit = ufs_rw64(s->q2v_softlimit, needswap);
@@ -98,7 +99,7 @@ quota2_ufs_rwq2v(const struct quota2_val
void
quota2_ufs_rwq2e(const struct quota2_entry *s, struct quota2_entry *d,
-int needswap)
+ int needswap)
{
quota2_ufs_rwq2v(&s->q2e_val[QL_BLOCK], &d->q2e_val[QL_BLOCK],
needswap);
@@ -110,7 +111,7 @@ int needswap)
int
quota_check_limit(uint64_t cur, uint64_t change, uint64_t soft, uint64_t hard,
time_t expire, time_t now)
-{
+{
if (cur + change > hard) {
if (cur <= soft)
return (QL_F_CROSS | QL_S_DENY_HARD);
@@ -124,4 +125,4 @@ quota_check_limit(uint64_t cur, uint64_t
return QL_S_ALLOW_SOFT;
}
return QL_S_ALLOW_OK;
-}
+}
Index: src/sys/ufs/ufs/ufs_acl.c
diff -u src/sys/ufs/ufs/ufs_acl.c:1.4 src/sys/ufs/ufs/ufs_acl.c:1.5
--- src/sys/ufs/ufs/ufs_acl.c:1.4 Fri Nov 26 17:35:12 2021
+++ src/sys/ufs/ufs/ufs_acl.c Wed Feb 22 21:49:45 2023
@@ -36,9 +36,9 @@
#if 0
__FBSDID("$FreeBSD: head/sys/ufs/ufs/ufs_acl.c 356669 2020-01-13 02:31:51Z mjg $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ufs_acl.c,v 1.4 2021/11/26 17:35:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_acl.c,v 1.5 2023/02/22 21:49:45 riastradh Exp $");
-#if defined(_KERNEL_OPT)
+#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
#include "opt_quota.h"
#include "opt_wapbl.h"
@@ -94,7 +94,7 @@ ufs_sync_acl_from_inode(struct inode *ip
ACL_USER_OBJ, ip->i_mode);
acl->acl_entry[i].ae_id = ACL_UNDEFINED_ID;
break;
-
+
case ACL_GROUP_OBJ:
acl_group_obj = &acl->acl_entry[i];
acl->acl_entry[i].ae_id = ACL_UNDEFINED_ID;
@@ -114,7 +114,7 @@ ufs_sync_acl_from_inode(struct inode *ip
case ACL_USER:
case ACL_GROUP:
break;
-
+
default:
panic("ufs_sync_acl_from_inode(): bad ae_tag");
}
Index: src/sys/ufs/ufs/ufs_extattr.c
diff -u src/sys/ufs/ufs/ufs_extattr.c:1.53 src/sys/ufs/ufs/ufs_extattr.c:1.54
--- src/sys/ufs/ufs/ufs_extattr.c:1.53 Tue Jun 29 22:40:54 2021
+++ src/sys/ufs/ufs/ufs_extattr.c Wed Feb 22 21:49:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_extattr.c,v 1.53 2021/06/29 22:40:54 dholland Exp $ */
+/* $NetBSD: ufs_extattr.c,v 1.54 2023/02/22 21:49:45 riastradh Exp $ */
/*-
* Copyright (c) 1999-2002 Robert N. M. Watson
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_extattr.c,v 1.53 2021/06/29 22:40:54 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_extattr.c,v 1.54 2023/02/22 21:49:45 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ffs.h"
@@ -103,8 +103,8 @@ static int ufs_extattr_rm(struct vnode *
const char *name, kauth_cred_t cred, struct lwp *l);
static struct ufs_extattr_list_entry *ufs_extattr_find_attr(struct ufsmount *,
int, const char *);
-static int ufs_extattr_get_header(struct vnode *,
- struct ufs_extattr_list_entry *,
+static int ufs_extattr_get_header(struct vnode *,
+ struct ufs_extattr_list_entry *,
struct ufs_extattr_header *, off_t *);
@@ -180,17 +180,17 @@ ufs_extattr_autocreate_attr(struct vnode
path = PNBUF_GET();
- /*
+ /*
* We only support system and user namespace autocreation
- */
+ */
switch (attrnamespace) {
case EXTATTR_NAMESPACE_SYSTEM:
- (void)snprintf(path, PATH_MAX, "%s/%s/%s/%s",
+ (void)snprintf(path, PATH_MAX, "%s/%s/%s/%s",
mp->mnt_stat.f_mntonname, UFS_EXTATTR_FSROOTSUBDIR,
UFS_EXTATTR_SUBDIR_SYSTEM, attrname);
break;
case EXTATTR_NAMESPACE_USER:
- (void)snprintf(path, PATH_MAX, "%s/%s/%s/%s",
+ (void)snprintf(path, PATH_MAX, "%s/%s/%s/%s",
mp->mnt_stat.f_mntonname, UFS_EXTATTR_FSROOTSUBDIR,
UFS_EXTATTR_SUBDIR_USER, attrname);
break;
@@ -203,8 +203,8 @@ ufs_extattr_autocreate_attr(struct vnode
/*
* Release extended attribute mount lock, otherwise
- * we can deadlock with another thread that would lock
- * vp after we unlock it below, and call
+ * we can deadlock with another thread that would lock
+ * vp after we unlock it below, and call
* ufs_extattr_uepm_lock(ump), for instance
* in ufs_getextattr().
*/
@@ -212,20 +212,20 @@ ufs_extattr_autocreate_attr(struct vnode
/*
* XXX unlock/lock should only be done when setting extattr
- * on backing store or one of its parent directory
+ * on backing store or one of its parent directory
* including root, but we always do it for now.
- */
+ */
KASSERT(VOP_ISLOCKED(vp) == LK_EXCLUSIVE);
VOP_UNLOCK(vp);
pb = pathbuf_create(path);
-
+
/*
* Since we do not hold ufs_extattr_uepm_lock anymore,
* another thread may race with us for backend creation,
* but only one can succeed here thanks to O_EXCL.
*
- * backing_vp is the backing store.
+ * backing_vp is the backing store.
*/
error = vn_open(NULL, pb, 0, O_CREAT|O_EXCL|O_RDWR, 0600,
&backing_vp, NULL, NULL);
@@ -256,13 +256,13 @@ ufs_extattr_autocreate_attr(struct vnode
uef.uef_size = ufs_extattr_autocreate;
error = vn_rdwr(UIO_WRITE, backing_vp, &uef, sizeof(uef), 0,
- UIO_SYSSPACE, IO_NODELOCKED|IO_APPEND,
+ UIO_SYSSPACE, IO_NODELOCKED|IO_APPEND,
l->l_cred, NULL, l);
VOP_UNLOCK(backing_vp);
if (error != 0) {
- printf("%s: write uef header failed for `%s' (%d)\n",
+ printf("%s: write uef header failed for `%s' (%d)\n",
__func__, attrname, error);
vn_close(backing_vp, FREAD|FWRITE, l->l_cred);
*uelep = NULL;
@@ -270,13 +270,13 @@ ufs_extattr_autocreate_attr(struct vnode
}
/*
- * Now enable attribute.
+ * Now enable attribute.
*/
error = ufs_extattr_enable(ump,attrnamespace, attrname, backing_vp, l);
KASSERT(VOP_ISLOCKED(backing_vp) == 0);
if (error != 0) {
- printf("%s: enable `%s' failed (%d)\n",
+ printf("%s: enable `%s' failed (%d)\n",
__func__, attrname, error);
vn_close(backing_vp, FREAD|FWRITE, l->l_cred);
*uelep = NULL;
@@ -286,7 +286,7 @@ ufs_extattr_autocreate_attr(struct vnode
uele = ufs_extattr_find_attr(ump, attrnamespace, attrname);
if (uele == NULL) {
printf("%s: atttribute `%s' created but not found!\n",
- __func__, attrname);
+ __func__, attrname);
vn_close(backing_vp, FREAD|FWRITE, l->l_cred);
*uelep = NULL;
return ESRCH; /* really internal error */
@@ -313,7 +313,7 @@ ufs_extattr_find_attr(struct ufsmount *u
search_attribute != NULL;
search_attribute = LIST_NEXT(search_attribute, uele_entries)) {
if (!(strncmp(attrname, search_attribute->uele_attrname,
- UFS_EXTATTR_MAXEXTATTRNAME)) &&
+ UFS_EXTATTR_MAXEXTATTRNAME)) &&
(attrnamespace == search_attribute->uele_attrnamespace)) {
return search_attribute;
}
@@ -406,7 +406,8 @@ ufs_extattr_start(struct mount *mp, stru
* one lock, requiring the caller to possibly special-case.
*/
static int
-ufs_extattr_lookup(struct vnode *start_dvp, int lockparent, const char *dirname,
+ufs_extattr_lookup(struct vnode *start_dvp, int lockparent,
+ const char *dirname,
struct vnode **vp, struct lwp *l)
{
struct vop_lookup_v2_args vargs;
@@ -594,7 +595,7 @@ ufs_extattr_iterate_directory(struct ufs
}
}
kmem_free(dirbuf, UFS_DIRBLKSIZ);
-
+
return 0;
}
@@ -693,9 +694,9 @@ ufs_extattr_autostart(struct mount *mp,
* be cleaned up on exit.
*/
error = ufs_extattr_subdir(l, mp, attr_dvp, UFS_EXTATTR_SUBDIR_SYSTEM,
- EXTATTR_NAMESPACE_SYSTEM);
+ EXTATTR_NAMESPACE_SYSTEM);
error = ufs_extattr_subdir(l, mp, attr_dvp, UFS_EXTATTR_SUBDIR_USER,
- EXTATTR_NAMESPACE_USER);
+ EXTATTR_NAMESPACE_USER);
/* Mask startup failures in sub-directories. */
error = 0;
@@ -776,7 +777,7 @@ ufs_extattr_enable(struct ufsmount *ump,
attribute->uele_attrnamespace = attrnamespace;
memset(&attribute->uele_fileheader, 0,
sizeof(struct ufs_extattr_fileheader));
-
+
attribute->uele_backing_vnode = backing_vnode;
auio.uio_iov = &aiov;
@@ -808,7 +809,7 @@ ufs_extattr_enable(struct ufsmount *ump,
attribute->uele_flags |= UELE_F_NEEDSWAP;
attribute->uele_fileheader.uef_magic =
ufs_rw32(attribute->uele_fileheader.uef_magic,
- UELE_NEEDSWAP(attribute));
+ UELE_NEEDSWAP(attribute));
if (attribute->uele_fileheader.uef_magic != UFS_EXTATTR_MAGIC) {
printf("%s: invalid attribute header magic\n",
__func__);
@@ -818,10 +819,10 @@ ufs_extattr_enable(struct ufsmount *ump,
}
attribute->uele_fileheader.uef_version =
ufs_rw32(attribute->uele_fileheader.uef_version,
- UELE_NEEDSWAP(attribute));
+ UELE_NEEDSWAP(attribute));
attribute->uele_fileheader.uef_size =
ufs_rw32(attribute->uele_fileheader.uef_size,
- UELE_NEEDSWAP(attribute));
+ UELE_NEEDSWAP(attribute));
if (attribute->uele_fileheader.uef_version != UFS_EXTATTR_VERSION) {
printf("%s: incorrect attribute header version %d != %d\n",
@@ -831,8 +832,7 @@ ufs_extattr_enable(struct ufsmount *ump,
goto unlock_free_exit;
}
- LIST_INSERT_HEAD(&ump->um_extattr.uepm_list, attribute,
- uele_entries);
+ LIST_INSERT_HEAD(&ump->um_extattr.uepm_list, attribute, uele_entries);
VOP_UNLOCK(backing_vnode);
return 0;
@@ -864,8 +864,7 @@ ufs_extattr_disable(struct ufsmount *ump
LIST_REMOVE(uele, uele_entries);
- error = vn_close(uele->uele_backing_vnode, FREAD|FWRITE,
- l->l_cred);
+ error = vn_close(uele->uele_backing_vnode, FREAD|FWRITE, l->l_cred);
kmem_free(uele, sizeof(*uele));
@@ -916,7 +915,7 @@ ufs_extattrctl(struct mount *mp, int cmd
case UFS_EXTATTR_CMD_START:
error = ufs_extattr_autostart(mp, l);
return error;
-
+
case UFS_EXTATTR_CMD_STOP:
ufs_extattr_stop(mp, l);
return 0;
@@ -1179,7 +1178,7 @@ vop_listextattr {
*/
static int
ufs_extattr_list(struct vnode *vp, int attrnamespace,
- struct uio *uio, size_t *size, int flag,
+ struct uio *uio, size_t *size, int flag,
kauth_cred_t cred, struct lwp *l)
{
struct ufs_extattr_list_entry *uele;
@@ -1210,8 +1209,8 @@ ufs_extattr_list(struct vnode *vp, int a
return error;
/*
- * Don't need to get a lock on the backing file if
- * the listattr is being applied to the backing file,
+ * Don't need to get a lock on the backing file if
+ * the listattr is being applied to the backing file,
* as the lock is already held.
*/
if (uele->uele_backing_vnode != vp)
@@ -1245,8 +1244,8 @@ ufs_extattr_list(struct vnode *vp, int a
attrnamelen++;
}
- error = uiomove(uele->uele_attrname,
- (size_t)attrnamelen, uio);
+ error = uiomove(uele->uele_attrname,
+ (size_t)attrnamelen, uio);
if (error != 0)
break;
}
@@ -1369,12 +1368,12 @@ ufs_extattr_set(struct vnode *vp, int at
attribute = ufs_extattr_find_attr(ump, attrnamespace, name);
if (!attribute) {
- error = ufs_extattr_autocreate_attr(vp, attrnamespace,
- name, l, &attribute);
+ error = ufs_extattr_autocreate_attr(vp, attrnamespace,
+ name, l, &attribute);
if (error == EEXIST) {
/* Another thread raced us for backend creation */
error = 0;
- attribute =
+ attribute =
ufs_extattr_find_attr(ump, attrnamespace, name);
}
@@ -1405,7 +1404,7 @@ ufs_extattr_set(struct vnode *vp, int at
ueh.ueh_len = ufs_rw32((uint32_t) uio->uio_resid,
UELE_NEEDSWAP(attribute));
ueh.ueh_flags = ufs_rw32(UFS_EXTATTR_ATTR_FLAG_INUSE,
- UELE_NEEDSWAP(attribute));
+ UELE_NEEDSWAP(attribute));
ueh.ueh_i_gen = ufs_rw32(ip->i_gen, UELE_NEEDSWAP(attribute));
local_aiov.iov_base = &ueh;
local_aiov.iov_len = sizeof(struct ufs_extattr_header);
@@ -1421,7 +1420,7 @@ ufs_extattr_set(struct vnode *vp, int at
* being applied to the backing file, as the lock is already held.
*/
if (attribute->uele_backing_vnode != vp)
- vn_lock(attribute->uele_backing_vnode,
+ vn_lock(attribute->uele_backing_vnode,
LK_EXCLUSIVE | LK_RETRY);
ioflag = IO_NODELOCKED;
@@ -1475,7 +1474,7 @@ ufs_extattr_rm(struct vnode *vp, int att
off_t base_offset;
int error = 0, ioflag;
- if (vp->v_mount->mnt_flag & MNT_RDONLY)
+ if (vp->v_mount->mnt_flag & MNT_RDONLY)
return EROFS;
if (!ufs_extattr_valid_attrname(attrnamespace, name))
Index: src/sys/ufs/ufs/ufs_lookup.c
diff -u src/sys/ufs/ufs/ufs_lookup.c:1.156 src/sys/ufs/ufs/ufs_lookup.c:1.157
--- src/sys/ufs/ufs/ufs_lookup.c:1.156 Sat Aug 6 18:26:42 2022
+++ src/sys/ufs/ufs/ufs_lookup.c Wed Feb 22 21:49:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_lookup.c,v 1.156 2022/08/06 18:26:42 andvar Exp $ */
+/* $NetBSD: ufs_lookup.c,v 1.157 2023/02/22 21:49:45 riastradh Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.156 2022/08/06 18:26:42 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.157 2023/02/22 21:49:45 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ffs.h"
@@ -250,7 +250,7 @@ ufs_can_delete(struct vnode *tdp, struct
if (error)
goto out;
- if (!(ip->i_mode & ISVTX))
+ if (!(ip->i_mode & ISVTX))
return 0;
/*
@@ -820,7 +820,7 @@ ufs_dirbadentry(const struct vnode *dp,
if (name[namlen]) {
str = "missing NUL in name";
#ifdef DIAGNOSTIC
- snprintf(buf, sizeof(buf), "%s [%*.*s] namlen=%d", str,
+ snprintf(buf, sizeof(buf), "%s [%*.*s] namlen=%d", str,
namlen, namlen, name, namlen);
str = buf;
#endif
Index: src/sys/ufs/ufs/ufs_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.117 src/sys/ufs/ufs/ufs_quota.c:1.118
--- src/sys/ufs/ufs/ufs_quota.c:1.117 Sat Jun 28 22:27:51 2014
+++ src/sys/ufs/ufs/ufs_quota.c Wed Feb 22 21:49:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota.c,v 1.117 2014/06/28 22:27:51 dholland Exp $ */
+/* $NetBSD: ufs_quota.c,v 1.118 2023/02/22 21:49:45 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,11 +35,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.117 2014/06/28 22:27:51 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.118 2023/02/22 21:49:45 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
-#endif
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
@@ -85,9 +85,9 @@ static int quota_handle_cmd_cursorget(st
struct quotactl_args *args);
static int quota_handle_cmd_del(struct mount *, struct lwp *,
struct quotactl_args *args);
-static int quota_handle_cmd_quotaon(struct mount *, struct lwp *,
+static int quota_handle_cmd_quotaon(struct mount *, struct lwp *,
struct quotactl_args *args);
-static int quota_handle_cmd_quotaoff(struct mount *, struct lwp *,
+static int quota_handle_cmd_quotaoff(struct mount *, struct lwp *,
struct quotactl_args *args);
static int quota_handle_cmd_cursoropen(struct mount *, struct lwp *,
struct quotactl_args *args);
@@ -174,57 +174,57 @@ quota_handle_cmd(struct mount *mp, struc
int error = 0;
switch (args->qc_op) {
- case QUOTACTL_STAT:
+ case QUOTACTL_STAT:
error = quota_handle_cmd_stat(mp, l, args);
break;
- case QUOTACTL_IDTYPESTAT:
+ case QUOTACTL_IDTYPESTAT:
error = quota_handle_cmd_idtypestat(mp, l, args);
break;
- case QUOTACTL_OBJTYPESTAT:
+ case QUOTACTL_OBJTYPESTAT:
error = quota_handle_cmd_objtypestat(mp, l, args);
break;
- case QUOTACTL_QUOTAON:
+ case QUOTACTL_QUOTAON:
error = quota_handle_cmd_quotaon(mp, l, args);
break;
- case QUOTACTL_QUOTAOFF:
+ case QUOTACTL_QUOTAOFF:
error = quota_handle_cmd_quotaoff(mp, l, args);
break;
- case QUOTACTL_GET:
+ case QUOTACTL_GET:
error = quota_handle_cmd_get(mp, l, args);
break;
- case QUOTACTL_PUT:
+ case QUOTACTL_PUT:
error = quota_handle_cmd_put(mp, l, args);
break;
- case QUOTACTL_CURSORGET:
+ case QUOTACTL_CURSORGET:
error = quota_handle_cmd_cursorget(mp, l, args);
break;
- case QUOTACTL_DEL:
+ case QUOTACTL_DEL:
error = quota_handle_cmd_del(mp, l, args);
break;
- case QUOTACTL_CURSOROPEN:
+ case QUOTACTL_CURSOROPEN:
error = quota_handle_cmd_cursoropen(mp, l, args);
break;
- case QUOTACTL_CURSORCLOSE:
+ case QUOTACTL_CURSORCLOSE:
error = quota_handle_cmd_cursorclose(mp, l, args);
break;
- case QUOTACTL_CURSORSKIPIDTYPE:
+ case QUOTACTL_CURSORSKIPIDTYPE:
error = quota_handle_cmd_cursorskipidtype(mp, l, args);
break;
- case QUOTACTL_CURSORATEND:
+ case QUOTACTL_CURSORATEND:
error = quota_handle_cmd_cursoratend(mp, l, args);
break;
- case QUOTACTL_CURSORREWIND:
+ case QUOTACTL_CURSORREWIND:
error = quota_handle_cmd_cursorrewind(mp, l, args);
break;
- default:
+ default:
panic("Invalid quotactl operation %d\n", args->qc_op);
}
return error;
}
-static int
-quota_handle_cmd_stat(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_stat(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
@@ -261,8 +261,8 @@ quota_handle_cmd_stat(struct mount *mp,
return 0;
}
-static int
-quota_handle_cmd_idtypestat(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_idtypestat(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
@@ -281,21 +281,21 @@ quota_handle_cmd_idtypestat(struct mount
* These are the same for both QUOTA and QUOTA2.
*/
switch (idtype) {
- case QUOTA_IDTYPE_USER:
+ case QUOTA_IDTYPE_USER:
name = "user";
break;
- case QUOTA_IDTYPE_GROUP:
+ case QUOTA_IDTYPE_GROUP:
name = "group";
break;
- default:
+ default:
return EINVAL;
}
strlcpy(info->qis_name, name, sizeof(info->qis_name));
return 0;
}
-static int
-quota_handle_cmd_objtypestat(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_objtypestat(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
@@ -315,15 +315,15 @@ quota_handle_cmd_objtypestat(struct moun
* These are the same for both QUOTA and QUOTA2.
*/
switch (objtype) {
- case QUOTA_OBJTYPE_BLOCKS:
+ case QUOTA_OBJTYPE_BLOCKS:
name = "block";
isbytes = 1;
break;
- case QUOTA_OBJTYPE_FILES:
+ case QUOTA_OBJTYPE_FILES:
name = "file";
isbytes = 0;
break;
- default:
+ default:
return EINVAL;
}
strlcpy(info->qos_name, name, sizeof(info->qos_name));
@@ -341,8 +341,8 @@ quota_get_auth(struct mount *mp, struct
KAUTH_REQ_SYSTEM_FS_QUOTA_GET, mp, KAUTH_ARG(id), NULL);
}
-static int
-quota_handle_cmd_get(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_get(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
@@ -356,9 +356,9 @@ quota_handle_cmd_get(struct mount *mp, s
if ((ump->um_flags & (UFS_QUOTA|UFS_QUOTA2)) == 0)
return EOPNOTSUPP;
-
+
error = quota_get_auth(mp, l, qk->qk_id);
- if (error != 0)
+ if (error != 0)
return error;
#ifdef QUOTA
if (ump->um_flags & UFS_QUOTA) {
@@ -371,15 +371,15 @@ quota_handle_cmd_get(struct mount *mp, s
} else
#endif
panic("quota_handle_cmd_get: no support ?");
-
+
if (error != 0)
return error;
return error;
}
-static int
-quota_handle_cmd_put(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_put(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
@@ -418,7 +418,7 @@ quota_handle_cmd_put(struct mount *mp, s
} else
#endif
panic("quota_handle_cmd_get: no support ?");
-
+
if (error == ENOENT) {
error = 0;
}
@@ -426,8 +426,8 @@ quota_handle_cmd_put(struct mount *mp, s
return error;
}
-static int
-quota_handle_cmd_del(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_del(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
@@ -459,7 +459,7 @@ quota_handle_cmd_del(struct mount *mp, s
} else
#endif
panic("quota_handle_cmd_get: no support ?");
-
+
if (error && error != ENOENT)
goto err;
}
@@ -469,8 +469,8 @@ quota_handle_cmd_del(struct mount *mp, s
return error;
}
-static int
-quota_handle_cmd_cursorget(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_cursorget(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
@@ -480,12 +480,12 @@ quota_handle_cmd_cursorget(struct mount
if ((ump->um_flags & UFS_QUOTA2) == 0)
return EOPNOTSUPP;
-
+
error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
KAUTH_REQ_SYSTEM_FS_QUOTA_GET, mp, NULL, NULL);
if (error)
return error;
-
+
#ifdef QUOTA2
if (ump->um_flags & UFS_QUOTA2) {
struct quotakcursor *cursor = args->u.cursorget.qc_cursor;
@@ -503,8 +503,8 @@ quota_handle_cmd_cursorget(struct mount
return error;
}
-static int
-quota_handle_cmd_cursoropen(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_cursoropen(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
#ifdef QUOTA2
@@ -530,8 +530,8 @@ quota_handle_cmd_cursoropen(struct mount
return error;
}
-static int
-quota_handle_cmd_cursorclose(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_cursorclose(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
#ifdef QUOTA2
@@ -557,8 +557,8 @@ quota_handle_cmd_cursorclose(struct moun
return error;
}
-static int
-quota_handle_cmd_cursorskipidtype(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_cursorskipidtype(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
#ifdef QUOTA2
@@ -580,8 +580,8 @@ quota_handle_cmd_cursorskipidtype(struct
return error;
}
-static int
-quota_handle_cmd_cursoratend(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_cursoratend(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
#ifdef QUOTA2
@@ -603,8 +603,8 @@ quota_handle_cmd_cursoratend(struct moun
return error;
}
-static int
-quota_handle_cmd_cursorrewind(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_cursorrewind(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
#ifdef QUOTA2
@@ -625,8 +625,8 @@ quota_handle_cmd_cursorrewind(struct mou
return error;
}
-static int
-quota_handle_cmd_quotaon(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_quotaon(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
@@ -636,7 +636,7 @@ quota_handle_cmd_quotaon(struct mount *m
if ((ump->um_flags & UFS_QUOTA2) != 0)
return EBUSY;
-
+
error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
KAUTH_REQ_SYSTEM_FS_QUOTA_ONOFF, mp, NULL, NULL);
if (error != 0) {
@@ -649,12 +649,12 @@ quota_handle_cmd_quotaon(struct mount *m
#else
error = EOPNOTSUPP;
#endif
-
+
return error;
}
-static int
-quota_handle_cmd_quotaoff(struct mount *mp, struct lwp *l,
+static int
+quota_handle_cmd_quotaoff(struct mount *mp, struct lwp *l,
struct quotactl_args *args)
{
struct ufsmount *ump = VFSTOUFS(mp);
@@ -664,7 +664,7 @@ quota_handle_cmd_quotaoff(struct mount *
if ((ump->um_flags & UFS_QUOTA2) != 0)
return EOPNOTSUPP;
-
+
error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
KAUTH_REQ_SYSTEM_FS_QUOTA_ONOFF, mp, NULL, NULL);
if (error != 0) {
@@ -676,7 +676,7 @@ quota_handle_cmd_quotaoff(struct mount *
#else
error = EOPNOTSUPP;
#endif
-
+
return error;
}
Index: src/sys/ufs/ufs/ufs_quota1.c
diff -u src/sys/ufs/ufs/ufs_quota1.c:1.25 src/sys/ufs/ufs/ufs_quota1.c:1.26
--- src/sys/ufs/ufs/ufs_quota1.c:1.25 Tue Apr 26 15:37:25 2022
+++ src/sys/ufs/ufs/ufs_quota1.c Wed Feb 22 21:49:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota1.c,v 1.25 2022/04/26 15:37:25 hannken Exp $ */
+/* $NetBSD: ufs_quota1.c,v 1.26 2023/02/22 21:49:45 riastradh 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.25 2022/04/26 15:37:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.26 2023/02/22 21:49:45 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -91,8 +91,8 @@ chkdq1(struct inode *ip, int64_t change,
continue;
if ((flags & FORCE) == 0 &&
kauth_authorize_system(cred, KAUTH_SYSTEM_FS_QUOTA,
- KAUTH_REQ_SYSTEM_FS_QUOTA_NOLIMIT, KAUTH_ARG(i),
- KAUTH_ARG(QL_BLOCK), NULL) != 0) {
+ KAUTH_REQ_SYSTEM_FS_QUOTA_NOLIMIT, KAUTH_ARG(i),
+ KAUTH_ARG(QL_BLOCK), NULL) != 0) {
mutex_enter(&dq->dq_interlock);
error = chkdqchg(ip, change, cred, i);
mutex_exit(&dq->dq_interlock);
@@ -197,9 +197,10 @@ chkiq1(struct inode *ip, int32_t change,
for (i = 0; i < MAXQUOTAS; i++) {
if ((dq = ip->i_dquot[i]) == NODQUOT)
continue;
- if ((flags & FORCE) == 0 && kauth_authorize_system(cred,
- KAUTH_SYSTEM_FS_QUOTA, KAUTH_REQ_SYSTEM_FS_QUOTA_NOLIMIT,
- KAUTH_ARG(i), KAUTH_ARG(QL_FILE), NULL) != 0) {
+ if ((flags & FORCE) == 0 &&
+ kauth_authorize_system(cred, KAUTH_SYSTEM_FS_QUOTA,
+ KAUTH_REQ_SYSTEM_FS_QUOTA_NOLIMIT,
+ KAUTH_ARG(i), KAUTH_ARG(QL_FILE), NULL) != 0) {
mutex_enter(&dq->dq_interlock);
error = chkiqchg(ip, change, cred, i);
mutex_exit(&dq->dq_interlock);
@@ -318,7 +319,7 @@ quota1_handle_cmd_quotaon(struct lwp *l,
mp->mnt_stat.f_mntonname);
return (EBUSY);
}
-
+
if (mp->mnt_wapbl != NULL) {
printf("%s: quota v1 cannot be used with -o log\n",
mp->mnt_stat.f_mntonname);
@@ -479,7 +480,7 @@ quota1_handle_cmd_quotaoff(struct lwp *l
return (error);
}
-int
+int
quota1_handle_cmd_get(struct ufsmount *ump, const struct quotakey *qk,
struct quotaval *qv)
{
@@ -517,13 +518,13 @@ quota1_handle_cmd_get(struct ufsmount *u
}
switch (qk->qk_objtype) {
- case QUOTA_OBJTYPE_BLOCKS:
+ case QUOTA_OBJTYPE_BLOCKS:
*qv = blocks;
break;
- case QUOTA_OBJTYPE_FILES:
+ case QUOTA_OBJTYPE_FILES:
*qv = files;
break;
- default:
+ default:
return EINVAL;
}
@@ -548,18 +549,18 @@ quota1_handle_cmd_put(struct ufsmount *u
int error;
switch (key->qk_idtype) {
- case QUOTA_IDTYPE_USER:
- case QUOTA_IDTYPE_GROUP:
+ case QUOTA_IDTYPE_USER:
+ case QUOTA_IDTYPE_GROUP:
break;
- default:
+ default:
return EINVAL;
}
switch (key->qk_objtype) {
- case QUOTA_OBJTYPE_BLOCKS:
- case QUOTA_OBJTYPE_FILES:
+ case QUOTA_OBJTYPE_BLOCKS:
+ case QUOTA_OBJTYPE_FILES:
break;
- default:
+ default:
return EINVAL;
}
@@ -657,7 +658,7 @@ setquota1(struct mount *mp, u_long id, i
struct dquot *dq;
struct dquot *ndq;
struct ufsmount *ump = VFSTOUFS(mp);
-
+
if ((error = dqget(NULLVP, id, ump, type, &ndq)) != 0)
return (error);
Index: src/sys/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.45 src/sys/ufs/ufs/ufs_quota2.c:1.46
--- src/sys/ufs/ufs/ufs_quota2.c:1.45 Sat May 28 22:08:46 2022
+++ src/sys/ufs/ufs/ufs_quota2.c Wed Feb 22 21:49:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.45 2022/05/28 22:08:46 andvar Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.46 2023/02/22 21:49:45 riastradh 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.45 2022/05/28 22:08:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.46 2023/02/22 21:49:45 riastradh Exp $");
#include <sys/buf.h>
#include <sys/param.h>
@@ -109,7 +109,7 @@ q2val_to_quotaval(struct quota2_val *q2v
*/
static void
q2e_to_quotaval(struct quota2_entry *q2e, int def,
- id_t *id, int objtype, struct quotaval *ret)
+ id_t *id, int objtype, struct quotaval *ret)
{
if (def) {
*id = QUOTA_DEFAULTID;
@@ -147,7 +147,7 @@ getq2h(struct ufsmount *ump, int type,
flags, &bp);
if (error)
return error;
- if (bp->b_resid != 0)
+ if (bp->b_resid != 0)
panic("dq2get: %s quota file truncated", quotatypes[type]);
q2h = (void *)bp->b_data;
@@ -189,7 +189,8 @@ getq2e(struct ufsmount *ump, int type, d
static int
quota2_walk_list(struct ufsmount *ump, struct buf *hbp, int type,
uint64_t *offp, int flags, void *a,
- int (*func)(struct ufsmount *, uint64_t *, struct quota2_entry *, uint64_t, void *))
+ int (*func)(struct ufsmount *, uint64_t *, struct quota2_entry *, uint64_t,
+ void *))
{
const int needswap = UFS_MPNEEDSWAP(ump);
daddr_t off = ufs_rw64(*offp, needswap);
@@ -210,13 +211,13 @@ quota2_walk_list(struct ufsmount *ump, s
/* still in the same buf */
bp = obp;
} else {
- ret = bread(ump->um_quotas[type], lblkno,
+ ret = bread(ump->um_quotas[type], lblkno,
ump->umq2_bsize, flags, &bp);
if (ret)
return ret;
if (bp->b_resid != 0) {
- panic("quota2_walk_list: %s quota file corrupted",
- quotatypes[type]);
+ panic("%s: %s quota file corrupted",
+ __func__, quotatypes[type]);
}
}
q2e = (void *)((char *)(bp->b_data) + blkoff);
@@ -283,7 +284,7 @@ quota2_umount(struct mount *mp, int flag
return 0;
}
-static int
+static int
quota2_q2ealloc(struct ufsmount *ump, int type, uid_t uid, struct dquot *dq)
{
int error, error2;
@@ -348,7 +349,7 @@ quota2_q2ealloc(struct ufsmount *ump, in
memcpy(q2e, &q2h->q2h_defentry, sizeof(*q2e));
q2e->q2e_uid = ufs_rw32(uid, needswap);
- /* insert in hash list */
+ /* insert in hash list */
q2e->q2e_next = q2h->q2h_entries[uid & hash_mask];
q2h->q2h_entries[uid & hash_mask] = ufs_rw64(offset, needswap);
if (hbp != bp) {
@@ -492,8 +493,8 @@ quota2_check(struct inode *ip, int vtype
if ((flags & FORCE) == 0 &&
kauth_authorize_system(cred, KAUTH_SYSTEM_FS_QUOTA,
- KAUTH_REQ_SYSTEM_FS_QUOTA_NOLIMIT,
- KAUTH_ARG(i), KAUTH_ARG(vtype), NULL) != 0) {
+ KAUTH_REQ_SYSTEM_FS_QUOTA_NOLIMIT,
+ KAUTH_ARG(i), KAUTH_ARG(vtype), NULL) != 0) {
/* enforce this limit */
switch(QL_STATUS(ql_stat)) {
case QL_S_DENY_HARD:
@@ -589,7 +590,7 @@ quota2_handle_cmd_put(struct ufsmount *u
error = UFS_WAPBL_BEGIN(ump->um_mountp);
if (error)
return error;
-
+
if (key->qk_id == QUOTA_DEFAULTID) {
mutex_enter(&dqlock);
error = getq2h(ump, key->qk_idtype, &bp, &q2h, B_MODIFY);
@@ -623,7 +624,7 @@ quota2_handle_cmd_put(struct ufsmount *u
dq->dq2_blkoff, &bp, &q2ep, B_MODIFY);
if (error)
goto out_il;
-
+
quota2_ufs_rwq2e(q2ep, &q2e, needswap);
/*
* Reset time limit if previously had no soft limit or were
@@ -632,8 +633,11 @@ quota2_handle_cmd_put(struct ufsmount *u
if (val->qv_softlimit &&
q2e.q2e_val[key->qk_objtype].q2v_cur >= val->qv_softlimit &&
(q2e.q2e_val[key->qk_objtype].q2v_softlimit == 0 ||
- q2e.q2e_val[key->qk_objtype].q2v_cur < q2e.q2e_val[key->qk_objtype].q2v_softlimit))
- q2e.q2e_val[key->qk_objtype].q2v_time = time_second + val->qv_grace;
+ (q2e.q2e_val[key->qk_objtype].q2v_cur <
+ q2e.q2e_val[key->qk_objtype].q2v_softlimit))) {
+ q2e.q2e_val[key->qk_objtype].q2v_time =
+ time_second + val->qv_grace;
+ }
quota2_dict_update_q2e_limits(key->qk_objtype, val, &q2e);
quota2_ufs_rwq2e(&q2e, q2ep, needswap);
quota2_bwrite(ump->um_mountp, bp);
@@ -653,7 +657,8 @@ struct dq2clear_callback {
};
static int
-dq2clear_callback(struct ufsmount *ump, uint64_t *offp, struct quota2_entry *q2e,
+dq2clear_callback(struct ufsmount *ump, uint64_t *offp,
+ struct quota2_entry *q2e,
uint64_t off, void *v)
{
struct dq2clear_callback *c = v;
@@ -722,7 +727,7 @@ quota2_handle_cmd_del(struct ufsmount *u
error = UFS_WAPBL_BEGIN(ump->um_mountp);
if (error)
goto out_dq;
-
+
error = getq2e(ump, idtype, dq->dq2_lblkno, dq->dq2_blkoff,
&bp, &q2ep, B_MODIFY);
if (error)
@@ -745,11 +750,11 @@ quota2_handle_cmd_del(struct ufsmount *u
canfree = 1;
for (i = 0; i < N_QL; i++) {
if (q2ep->q2e_val[i].q2v_cur != 0 ||
- (q2ep->q2e_val[i].q2v_softlimit !=
+ (q2ep->q2e_val[i].q2v_softlimit !=
q2e.q2e_val[i].q2v_softlimit) ||
- (q2ep->q2e_val[i].q2v_hardlimit !=
+ (q2ep->q2e_val[i].q2v_hardlimit !=
q2e.q2e_val[i].q2v_hardlimit) ||
- (q2ep->q2e_val[i].q2v_grace !=
+ (q2ep->q2e_val[i].q2v_grace !=
q2e.q2e_val[i].q2v_grace)) {
canfree = 0;
break;
@@ -899,11 +904,11 @@ 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, qv);
+ qk->qk_objtype, qv);
(void)id2;
} else
error = quota2_fetch_quotaval(ump, qk, qv);
-
+
return error;
}
@@ -1236,8 +1241,8 @@ q2cursor_getvals(struct ufsmount *ump, s
q2e = *default_q2e;
} else {
error = quota2_fetch_q2e(ump,
- &state->keys[pos],
- &q2e);
+ &state->keys[pos],
+ &q2e);
if (error == ENOENT) {
/* something changed - start over */
error = EDEADLK;
@@ -1330,12 +1335,12 @@ quota2_handle_cmd_cursorget(struct ufsmo
* out on error.
*/
q2cursor_initstate(&state, keys, vals, maxreturn,
- cursor->q2c_blocks_done);
+ cursor->q2c_blocks_done);
newcursor = *cursor;
/* Assign keys */
error = q2cursor_getkeys(ump, idtype, &newcursor, &state,
- "a2_hash_size, &default_q2e);
+ "a2_hash_size, &default_q2e);
if (error) {
return error;
}
@@ -1433,13 +1438,13 @@ quota2_handle_cmd_cursorskipidtype(struc
}
switch (idtype) {
- case QUOTA_IDTYPE_USER:
+ case QUOTA_IDTYPE_USER:
cursor->q2c_users_done = 1;
break;
- case QUOTA_IDTYPE_GROUP:
+ case QUOTA_IDTYPE_GROUP:
cursor->q2c_groups_done = 1;
break;
- default:
+ default:
return EINVAL;
}
Index: src/sys/ufs/ufs/ufs_vfsops.c
diff -u src/sys/ufs/ufs/ufs_vfsops.c:1.60 src/sys/ufs/ufs/ufs_vfsops.c:1.61
--- src/sys/ufs/ufs/ufs_vfsops.c:1.60 Fri May 1 08:43:37 2020
+++ src/sys/ufs/ufs/ufs_vfsops.c Wed Feb 22 21:49:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vfsops.c,v 1.60 2020/05/01 08:43:37 hannken Exp $ */
+/* $NetBSD: ufs_vfsops.c,v 1.61 2023/02/22 21:49:45 riastradh Exp $ */
/*
* Copyright (c) 1991, 1993, 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.60 2020/05/01 08:43:37 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.61 2023/02/22 21:49:45 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -146,7 +146,7 @@ ufs_quotactl(struct mount *mp, struct qu
return (error);
#endif
}
-
+
#if 0
switch (cmd) {
case Q_SYNC:
@@ -323,7 +323,7 @@ static int
ufs_modcmd(modcmd_t cmd, void *arg)
{
int error;
-
+
switch (cmd) {
case MODULE_CMD_INIT:
ufs_init();
