comparison usr/src/uts/common/fs/zfs/zil.c @ 13765:9410cf539b11

backout 3006: causes 3046 (panics after mounting root)
author Richard Lowe <richlowe@richlowe.net>
date Wed, 01 Aug 2012 16:40:39 -0400
parents 38b4aca480b3
children cd512c80fd75
comparison
equal deleted inserted replaced
13764:38b4aca480b3 13765:9410cf539b11
18 * 18 *
19 * CDDL HEADER END 19 * CDDL HEADER END
20 */ 20 */
21 /* 21 /*
22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23 * Copyright (c) 2012 by Delphix. All rights reserved. 23 * Copyright (c) 2011 by Delphix. All rights reserved.
24 */ 24 */
25 25
26 /* Portions Copyright 2010 Robert Milkowski */ 26 /* Portions Copyright 2010 Robert Milkowski */
27 27
28 #include <sys/zfs_context.h> 28 #include <sys/zfs_context.h>
1060 */ 1060 */
1061 lrc->lrc_seq = ++zilog->zl_lr_seq; /* we are single threaded */ 1061 lrc->lrc_seq = ++zilog->zl_lr_seq; /* we are single threaded */
1062 lwb->lwb_nused += reclen + dlen; 1062 lwb->lwb_nused += reclen + dlen;
1063 lwb->lwb_max_txg = MAX(lwb->lwb_max_txg, txg); 1063 lwb->lwb_max_txg = MAX(lwb->lwb_max_txg, txg);
1064 ASSERT3U(lwb->lwb_nused, <=, lwb->lwb_sz); 1064 ASSERT3U(lwb->lwb_nused, <=, lwb->lwb_sz);
1065 ASSERT0(P2PHASE(lwb->lwb_nused, sizeof (uint64_t))); 1065 ASSERT3U(P2PHASE(lwb->lwb_nused, sizeof (uint64_t)), ==, 0);
1066 1066
1067 return (lwb); 1067 return (lwb);
1068 } 1068 }
1069 1069
1070 itx_t * 1070 itx_t *