Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous; it is wrong.

This commit is contained in:
dholland 2013-07-29 16:39:37 +00:00
parent c37d15ffcf
commit c482f134e6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/ufs/lfs/lfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vnops.c,v 1.255 2013/07/28 04:24:44 pgoyette Exp $ */
/* $NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.255 2013/07/28 04:24:44 pgoyette Exp $");
__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.256 2013/07/29 16:39:37 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@ -620,6 +620,7 @@ lfs_mknod(void *v)
ip->i_flag |= IN_ACCESS | IN_CHANGE | IN_UPDATE;
if (vap->va_rdev != VNOVAL) {
struct ulfsmount *ump = ip->i_ump;
struct lfs *fs = ip->i_lfs;
/*
* Want to be able to use this to make badblock
* inodes, so don't truncate the dev number.

11
sys/ufs/lfs/ulfs_quota2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ulfs_quota2.c,v 1.11 2013/07/28 04:49:03 pgoyette Exp $ */
/* $NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 dholland Exp $ */
/* from NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp */
/* from NetBSD: ffs_quota2.c,v 1.4 2011/06/12 03:36:00 rmind Exp */
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.11 2013/07/28 04:49:03 pgoyette Exp $");
__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.12 2013/07/29 16:39:37 dholland Exp $");
#include <sys/buf.h>
#include <sys/param.h>
@ -305,6 +305,7 @@ quota2_q2ealloc(struct ulfsmount *ump, int type, uid_t uid, struct dquot *dq)
struct quota2_entry *q2e;
daddr_t offset;
u_long hash_mask;
struct lfs *fs = ump->um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
KASSERT(mutex_owned(&dq->dq_interlock));
@ -451,6 +452,7 @@ quota2_check(struct inode *ip, int vtype, int64_t change, kauth_cred_t cred,
struct dquot *dq;
uint64_t ncurblks;
struct ulfsmount *ump = ip->i_ump;
struct lfs *fs = ip->i_lfs;
struct mount *mp = ump->um_mountp;
const int needswap = ULFS_MPNEEDSWAP(fs);
int i;
@ -588,6 +590,7 @@ lfsquota2_handle_cmd_put(struct ulfsmount *ump, const struct quotakey *key,
struct quota2_header *q2h;
struct quota2_entry q2e, *q2ep;
struct buf *bp;
struct lfs *fs = ump->um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
/* make sure we can index by the fs-independent idtype */
@ -792,6 +795,7 @@ quota2_fetch_q2e(struct ulfsmount *ump, const struct quotakey *qk,
int error;
struct quota2_entry *q2ep;
struct buf *bp;
struct lfs *fs = ump->um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
error = lfs_dqget(NULLVP, qk->qk_id, ump, qk->qk_idtype, &dq);
@ -827,6 +831,7 @@ quota2_fetch_quotaval(struct ulfsmount *ump, const struct quotakey *qk,
int error;
struct quota2_entry *q2ep, q2e;
struct buf *bp;
struct lfs *fs = ump->um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
id_t id2;
@ -865,6 +870,7 @@ lfsquota2_handle_cmd_get(struct ulfsmount *ump, const struct quotakey *qk,
struct quota2_header *q2h;
struct quota2_entry q2e;
struct buf *bp;
struct lfs *fs = ump->um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
id_t id2;
@ -1119,6 +1125,7 @@ q2cursor_getkeys(struct ulfsmount *ump, int idtype, struct ulfsq2_cursor *cursor
struct q2cursor_state *state,
int *hashsize_ret, struct quota2_entry *default_q2e_ret)
{
struct lfs *fs = ump->um_lfs;
const int needswap = ULFS_MPNEEDSWAP(fs);
struct buf *hbp;
struct quota2_header *q2h;