Module Name: src
Committed By: dholland
Date: Mon Jul 29 16:39:37 UTC 2013
Modified Files:
src/sys/ufs/lfs: lfs_vnops.c ulfs_quota2.c
Log Message:
Revert previous; it is wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.11 -r1.12 src/sys/ufs/lfs/ulfs_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/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.255 src/sys/ufs/lfs/lfs_vnops.c:1.256
--- src/sys/ufs/lfs/lfs_vnops.c:1.255 Sun Jul 28 04:24:44 2013
+++ src/sys/ufs/lfs/lfs_vnops.c Mon Jul 29 16:39:37 2013
@@ -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.
Index: src/sys/ufs/lfs/ulfs_quota2.c
diff -u src/sys/ufs/lfs/ulfs_quota2.c:1.11 src/sys/ufs/lfs/ulfs_quota2.c:1.12
--- src/sys/ufs/lfs/ulfs_quota2.c:1.11 Sun Jul 28 04:49:03 2013
+++ src/sys/ufs/lfs/ulfs_quota2.c Mon Jul 29 16:39:37 2013
@@ -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, i
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
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 ulfsmoun
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,
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 *
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 ulfsmoun
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,
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;
