Module Name: src
Committed By: christos
Date: Thu Aug 18 08:08:02 UTC 2016
Modified Files:
src/sbin/fsck_lfs: bufcache.c bufcache.h
Log Message:
PR/51422: Jose Luis Rodriguez Garcia: completely remove B_NEEDCOMMIT
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sbin/fsck_lfs/bufcache.c
cvs rdiff -u -r1.12 -r1.13 src/sbin/fsck_lfs/bufcache.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_lfs/bufcache.c
diff -u src/sbin/fsck_lfs/bufcache.c:1.17 src/sbin/fsck_lfs/bufcache.c:1.18
--- src/sbin/fsck_lfs/bufcache.c:1.17 Thu Aug 18 04:04:28 2016
+++ src/sbin/fsck_lfs/bufcache.c Thu Aug 18 04:08:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.c,v 1.17 2016/08/18 08:04:28 christos Exp $ */
+/* $NetBSD: bufcache.c,v 1.18 2016/08/18 08:08:02 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -230,7 +230,6 @@ getblk(struct uvnode * vp, daddr_t lbn,
* the buffer, its contents are invalid; but shrinking is okay.
*/
if ((bp = incore(vp, lbn)) != NULL) {
- assert(!(bp->b_flags & B_NEEDCOMMIT));
assert(!(bp->b_flags & B_BUSY));
bp->b_flags |= B_BUSY;
bremfree(bp);
@@ -308,7 +307,6 @@ brelse(struct ubuf * bp, int set)
{
int age;
- assert(!(bp->b_flags & B_NEEDCOMMIT));
assert(bp->b_flags & B_BUSY);
bp->b_flags |= set;
Index: src/sbin/fsck_lfs/bufcache.h
diff -u src/sbin/fsck_lfs/bufcache.h:1.12 src/sbin/fsck_lfs/bufcache.h:1.13
--- src/sbin/fsck_lfs/bufcache.h:1.12 Sun Mar 29 15:35:58 2015
+++ src/sbin/fsck_lfs/bufcache.h Thu Aug 18 04:08:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.h,v 1.12 2015/03/29 19:35:58 chopps Exp $ */
+/* $NetBSD: bufcache.h,v 1.13 2016/08/18 08:08:02 christos Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -92,7 +92,6 @@ struct ubuf {
* These flags are kept in b_flags.
*/
#define B_AGE 0x00000001 /* Move to age queue when I/O done. */
-#define B_NEEDCOMMIT 0x00000002 /* Needs committing to stable storage */
#define B_BUSY 0x00000010 /* I/O in progress. */
#define B_DELWRI 0x00000080 /* Delay I/O until buffer reused. */
#define B_DONE 0x00000200 /* I/O completed. */
