git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make spl directory setable when building rpms and add --buildroot
[zfs.git]
/
module
/
zfs
/
zil.c
diff --git
a/module/zfs/zil.c
b/module/zfs/zil.c
index
c9618c1
..
64de856
100644
(file)
--- a/
module/zfs/zil.c
+++ b/
module/zfs/zil.c
@@
-1163,7
+1163,7
@@
zil_lwb_commit(zilog_t *zilog, itx_t *itx, lwb_t *lwb)
lwb->lwb_nused += reclen + dlen;
lwb->lwb_max_txg = MAX(lwb->lwb_max_txg, txg);
ASSERT3U(lwb->lwb_nused, <=, lwb->lwb_sz);
lwb->lwb_nused += reclen + dlen;
lwb->lwb_max_txg = MAX(lwb->lwb_max_txg, txg);
ASSERT3U(lwb->lwb_nused, <=, lwb->lwb_sz);
- ASSERT
3U(P2PHASE(lwb->lwb_nused, sizeof (uint64_t)), ==, 0
);
+ ASSERT
0(P2PHASE(lwb->lwb_nused, sizeof (uint64_t))
);
return (lwb);
}
return (lwb);
}
@@
-1956,7
+1956,7
@@
zil_resume(zilog_t *zilog)
}
typedef struct zil_replay_arg {
}
typedef struct zil_replay_arg {
- zil_replay_func_t *
*
zr_replay;
+ zil_replay_func_t *zr_replay;
void *zr_arg;
boolean_t zr_byteswap;
char *zr_lr;
void *zr_arg;
boolean_t zr_byteswap;
char *zr_lr;
@@
-2075,7
+2075,7
@@
zil_incr_blks(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
* If this dataset has a non-empty intent log, replay it and destroy it.
*/
void
* If this dataset has a non-empty intent log, replay it and destroy it.
*/
void
-zil_replay(objset_t *os, void *arg, zil_replay_func_t
*
replay_func[TX_MAX_TYPE])
+zil_replay(objset_t *os, void *arg, zil_replay_func_t replay_func[TX_MAX_TYPE])
{
zilog_t *zilog = dmu_objset_zil(os);
const zil_header_t *zh = zilog->zl_header;
{
zilog_t *zilog = dmu_objset_zil(os);
const zil_header_t *zh = zilog->zl_header;