diff options
| author | Brian Behlendorf <[email protected]> | 2015-06-11 10:27:36 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-06-11 10:27:48 -0700 |
| commit | 06358ea16e2ff256acc6376c71539f7211851404 (patch) | |
| tree | 346ad0f325b103b72ed7541fc0ce50511a1c0d34 /module/zfs/zil.c | |
| parent | 44de2f02d6b1365240f66fd5f3794ccbebd61a60 (diff) | |
| parent | 121b3cae742a0670d902a51bc61d49dc4a3e4445 (diff) | |
Merge branch 'lock-contention-on-arcs_mtx-final'
Signed-off-by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf
Closes #3115
Closes #3481
Diffstat (limited to 'module/zfs/zil.c')
| -rw-r--r-- | module/zfs/zil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zil.c b/module/zfs/zil.c index ff4d2cec0..6a3885816 100644 --- a/module/zfs/zil.c +++ b/module/zfs/zil.c @@ -204,7 +204,7 @@ zil_read_log_block(zilog_t *zilog, const blkptr_t *bp, blkptr_t *nbp, void *dst, char **end) { enum zio_flag zio_flags = ZIO_FLAG_CANFAIL; - uint32_t aflags = ARC_WAIT; + arc_flags_t aflags = ARC_FLAG_WAIT; arc_buf_t *abuf = NULL; zbookmark_phys_t zb; int error; @@ -280,7 +280,7 @@ zil_read_log_data(zilog_t *zilog, const lr_write_t *lr, void *wbuf) { enum zio_flag zio_flags = ZIO_FLAG_CANFAIL; const blkptr_t *bp = &lr->lr_blkptr; - uint32_t aflags = ARC_WAIT; + arc_flags_t aflags = ARC_FLAG_WAIT; arc_buf_t *abuf = NULL; zbookmark_phys_t zb; int error; |