diff options
| author | Tim Schumacher <[email protected]> | 2018-09-26 19:29:26 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-09-26 10:29:26 -0700 |
| commit | c13060e4787e9578dafad85a47c62457424bec9c (patch) | |
| tree | bf05ff868e01b6d607a234026a659ff4b5e1a789 /module/zfs/rrwlock.c | |
| parent | 7a23c81342df05ace730bd303b4a73854dba43dd (diff) | |
Linux 4.19-rc3+ compat: Remove refcount_t compat
torvalds/linux@59b57717f ("blkcg: delay blkg destruction until
after writeback has finished") added a refcount_t to the blkcg
structure. Due to the refcount_t compatibility code, zfs_refcount_t
was used by mistake.
Resolve this by removing the compatibility code and replacing the
occurrences of refcount_t with zfs_refcount_t.
Reviewed-by: Franz Pletz <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tim Schumacher <[email protected]>
Closes #7885
Closes #7932
Diffstat (limited to 'module/zfs/rrwlock.c')
| -rw-r--r-- | module/zfs/rrwlock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/rrwlock.c b/module/zfs/rrwlock.c index 704f76067..effff3305 100644 --- a/module/zfs/rrwlock.c +++ b/module/zfs/rrwlock.c @@ -183,9 +183,9 @@ rrw_enter_read_impl(rrwlock_t *rrl, boolean_t prio, void *tag) if (rrl->rr_writer_wanted || rrl->rr_track_all) { /* may or may not be a re-entrant enter */ rrn_add(rrl, tag); - (void) refcount_add(&rrl->rr_linked_rcount, tag); + (void) zfs_refcount_add(&rrl->rr_linked_rcount, tag); } else { - (void) refcount_add(&rrl->rr_anon_rcount, tag); + (void) zfs_refcount_add(&rrl->rr_anon_rcount, tag); } ASSERT(rrl->rr_writer == NULL); mutex_exit(&rrl->rr_lock); |