diff options
| author | Matthew Macy <[email protected]> | 2019-11-01 10:37:33 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-11-01 10:37:33 -0700 |
| commit | bd4dde8ef7b3861b20f12619f8994e037b303040 (patch) | |
| tree | 33f8795c8c9e103a3235cbb0afd90ccd795499d5 /cmd | |
| parent | bbc18de83afaceff498104d9d261c0328057ccf6 (diff) | |
Prefix struct rangelock
A struct rangelock already exists on FreeBSD. Add a zfs_ prefix as
per our convention to prevent any conflict with existing symbols.
This change is a follow up to 2cc479d0.
Reviewed-by: Matt Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #9534
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ztest/ztest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 695074d57..b886f1e99 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -2197,7 +2197,7 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, struct lwb *lwb, zgd->zgd_private = zd; if (buf != NULL) { /* immediate write */ - zgd->zgd_lr = (struct locked_range *)ztest_range_lock(zd, + zgd->zgd_lr = (struct zfs_locked_range *)ztest_range_lock(zd, object, offset, size, RL_READER); error = dmu_read(os, object, offset, size, buf, @@ -2212,7 +2212,7 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, struct lwb *lwb, offset = 0; } - zgd->zgd_lr = (struct locked_range *)ztest_range_lock(zd, + zgd->zgd_lr = (struct zfs_locked_range *)ztest_range_lock(zd, object, offset, size, RL_READER); error = dmu_buf_hold(os, object, offset, zgd, &db, |