Module Name: src
Committed By: pgoyette
Date: Sat Nov 14 22:03:54 UTC 2015
Modified Files:
src/sys/ufs/lfs: ulfs_inode.c ulfs_lookup.c ulfs_quota2.c
ulfs_snapshot.c ulfs_vnops.c
Log Message:
Remove historic references to wapbl.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/ufs/lfs/ulfs_inode.c
cvs rdiff -u -r1.34 -r1.35 src/sys/ufs/lfs/ulfs_lookup.c \
src/sys/ufs/lfs/ulfs_vnops.c
cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/lfs/ulfs_quota2.c
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/lfs/ulfs_snapshot.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/ulfs_inode.c
diff -u src/sys/ufs/lfs/ulfs_inode.c:1.11 src/sys/ufs/lfs/ulfs_inode.c:1.12
--- src/sys/ufs/lfs/ulfs_inode.c:1.11 Tue Sep 1 06:16:59 2015
+++ src/sys/ufs/lfs/ulfs_inode.c Sat Nov 14 22:03:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.c,v 1.11 2015/09/01 06:16:59 dholland Exp $ */
+/* $NetBSD: ulfs_inode.c,v 1.12 2015/11/14 22:03:54 pgoyette Exp $ */
/* from NetBSD: ufs_inode.c,v 1.89 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,12 +38,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.11 2015/09/01 06:16:59 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.12 2015/11/14 22:03:54 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
#include "opt_quota.h"
-#include "opt_wapbl.h"
#endif
#include <sys/param.h>
@@ -54,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c
#include <sys/kernel.h>
#include <sys/namei.h>
#include <sys/kauth.h>
-#include <sys/wapbl.h>
#include <sys/fstrans.h>
#include <sys/kmem.h>
Index: src/sys/ufs/lfs/ulfs_lookup.c
diff -u src/sys/ufs/lfs/ulfs_lookup.c:1.34 src/sys/ufs/lfs/ulfs_lookup.c:1.35
--- src/sys/ufs/lfs/ulfs_lookup.c:1.34 Mon Sep 21 01:24:23 2015
+++ src/sys/ufs/lfs/ulfs_lookup.c Sat Nov 14 22:03:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_lookup.c,v 1.34 2015/09/21 01:24:23 dholland Exp $ */
+/* $NetBSD: ulfs_lookup.c,v 1.35 2015/11/14 22:03:54 pgoyette Exp $ */
/* from NetBSD: ufs_lookup.c,v 1.122 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.34 2015/09/21 01:24:23 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.35 2015/11/14 22:03:54 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_lfs.h"
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.
#include <sys/vnode.h>
#include <sys/kernel.h>
#include <sys/kauth.h>
-#include <sys/wapbl.h>
#include <sys/fstrans.h>
#include <sys/proc.h>
#include <sys/kmem.h>
Index: src/sys/ufs/lfs/ulfs_vnops.c
diff -u src/sys/ufs/lfs/ulfs_vnops.c:1.34 src/sys/ufs/lfs/ulfs_vnops.c:1.35
--- src/sys/ufs/lfs/ulfs_vnops.c:1.34 Mon Sep 21 01:24:23 2015
+++ src/sys/ufs/lfs/ulfs_vnops.c Sat Nov 14 22:03:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_vnops.c,v 1.34 2015/09/21 01:24:23 dholland Exp $ */
+/* $NetBSD: ulfs_vnops.c,v 1.35 2015/11/14 22:03:54 pgoyette Exp $ */
/* from NetBSD: ufs_vnops.c,v 1.213 2013/06/08 05:47:02 kardel Exp */
/*-
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.34 2015/09/21 01:24:23 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.35 2015/11/14 22:03:54 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -90,7 +90,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c
#include <sys/dirent.h>
#include <sys/lockf.h>
#include <sys/kauth.h>
-#include <sys/wapbl.h>
#include <sys/fstrans.h>
#include <miscfs/specfs/specdev.h>
Index: src/sys/ufs/lfs/ulfs_quota2.c
diff -u src/sys/ufs/lfs/ulfs_quota2.c:1.21 src/sys/ufs/lfs/ulfs_quota2.c:1.22
--- src/sys/ufs/lfs/ulfs_quota2.c:1.21 Tue Jul 28 05:09:35 2015
+++ src/sys/ufs/lfs/ulfs_quota2.c Sat Nov 14 22:03:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota2.c,v 1.21 2015/07/28 05:09:35 dholland Exp $ */
+/* $NetBSD: ulfs_quota2.c,v 1.22 2015/11/14 22:03:54 pgoyette 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.21 2015/07/28 05:09:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.22 2015/11/14 22:03:54 pgoyette Exp $");
#include <sys/buf.h>
#include <sys/param.h>
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.
#include <sys/mount.h>
#include <sys/fstrans.h>
#include <sys/kauth.h>
-#include <sys/wapbl.h>
#include <sys/quota.h>
#include <sys/quotactl.h>
@@ -600,19 +599,19 @@ lfsquota2_handle_cmd_put(struct ulfsmoun
error = getq2h(ump, key->qk_idtype, &bp, &q2h, B_MODIFY);
if (error) {
mutex_exit(&lfs_dqlock);
- goto out_wapbl;
+ goto out_error;
}
lfsquota2_ulfs_rwq2e(&q2h->q2h_defentry, &q2e, needswap);
quota2_dict_update_q2e_limits(key->qk_objtype, val, &q2e);
lfsquota2_ulfs_rwq2e(&q2e, &q2h->q2h_defentry, needswap);
mutex_exit(&lfs_dqlock);
quota2_bwrite(ump->um_mountp, bp);
- goto out_wapbl;
+ goto out_error;
}
error = lfs_dqget(NULLVP, key->qk_id, ump, key->qk_idtype, &dq);
if (error)
- goto out_wapbl;
+ goto out_error;
mutex_enter(&dq->dq_interlock);
if (dq->dq2_lblkno == 0 && dq->dq2_blkoff == 0) {
@@ -637,7 +636,7 @@ lfsquota2_handle_cmd_put(struct ulfsmoun
out_il:
mutex_exit(&dq->dq_interlock);
lfs_dqrele(NULLVP, dq);
-out_wapbl:
+out_error:
return error;
}
@@ -719,7 +718,7 @@ lfsquota2_handle_cmd_del(struct ulfsmoun
error = getq2e(ump, idtype, dq->dq2_lblkno, dq->dq2_blkoff,
&bp, &q2ep, B_MODIFY);
if (error)
- goto out_wapbl;
+ goto out_error;
/* make sure we can index by the objtype passed in */
CTASSERT(QUOTA_OBJTYPE_BLOCKS == QL_BLOCK);
@@ -752,7 +751,7 @@ lfsquota2_handle_cmd_del(struct ulfsmoun
if (canfree == 0) {
quota2_bwrite(ump->um_mountp, bp);
- goto out_wapbl;
+ goto out_error;
}
/* we can free it. release bp so we can walk the list */
brelse(bp, 0);
@@ -773,7 +772,7 @@ lfsquota2_handle_cmd_del(struct ulfsmoun
out_dqlock:
mutex_exit(&lfs_dqlock);
-out_wapbl:
+out_error:
out_il:
mutex_exit(&dq->dq_interlock);
lfs_dqrele(NULLVP, dq);
Index: src/sys/ufs/lfs/ulfs_snapshot.c
diff -u src/sys/ufs/lfs/ulfs_snapshot.c:1.2 src/sys/ufs/lfs/ulfs_snapshot.c:1.3
--- src/sys/ufs/lfs/ulfs_snapshot.c:1.2 Sat Jun 8 22:05:15 2013
+++ src/sys/ufs/lfs/ulfs_snapshot.c Sat Nov 14 22:03:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_snapshot.c,v 1.2 2013/06/08 22:05:15 dholland Exp $ */
+/* $NetBSD: ulfs_snapshot.c,v 1.3 2015/11/14 22:03:54 pgoyette Exp $ */
/* from ffs_snapshot.c,v 1.122 2013/05/07 09:40:54 hannken Exp */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_snapshot.c,v 1.2 2013/06/08 22:05:15 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_snapshot.c,v 1.3 2015/11/14 22:03:54 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -61,7 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_snapsho
#include <sys/vnode.h>
#include <sys/kauth.h>
#include <sys/fstrans.h>
-#include <sys/wapbl.h>
#include <miscfs/specfs/specdev.h>
