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 /module/os | |
| 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 'module/os')
| -rw-r--r-- | module/os/linux/zfs/zfs_vnops.c | 6 | ||||
| -rw-r--r-- | module/os/linux/zfs/zfs_znode.c | 8 | ||||
| -rw-r--r-- | module/os/linux/zfs/zvol_os.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/module/os/linux/zfs/zfs_vnops.c b/module/os/linux/zfs/zfs_vnops.c index 41da7378b..edbb2fc64 100644 --- a/module/os/linux/zfs/zfs_vnops.c +++ b/module/os/linux/zfs/zfs_vnops.c @@ -485,7 +485,7 @@ zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) /* * Lock the range against changes. */ - locked_range_t *lr = zfs_rangelock_enter(&zp->z_rangelock, + zfs_locked_range_t *lr = zfs_rangelock_enter(&zp->z_rangelock, uio->uio_loffset, uio->uio_resid, RL_READER); /* @@ -666,7 +666,7 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) /* * If in append mode, set the io offset pointer to eof. */ - locked_range_t *lr; + zfs_locked_range_t *lr; if (ioflag & FAPPEND) { /* * Obtain an appending range lock to guarantee file append @@ -4518,7 +4518,7 @@ zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc) redirty_page_for_writepage(wbc, pp); unlock_page(pp); - locked_range_t *lr = zfs_rangelock_enter(&zp->z_rangelock, + zfs_locked_range_t *lr = zfs_rangelock_enter(&zp->z_rangelock, pgoff, pglen, RL_WRITER); lock_page(pp); diff --git a/module/os/linux/zfs/zfs_znode.c b/module/os/linux/zfs/zfs_znode.c index ebfaae67b..ab24d875e 100644 --- a/module/os/linux/zfs/zfs_znode.c +++ b/module/os/linux/zfs/zfs_znode.c @@ -90,7 +90,7 @@ int zfs_unlink_suspend_progress = 0; * called with the rangelock_t's rl_lock held, which avoids races. */ static void -zfs_rangelock_cb(locked_range_t *new, void *arg) +zfs_rangelock_cb(zfs_locked_range_t *new, void *arg) { znode_t *zp = arg; @@ -1468,7 +1468,7 @@ zfs_extend(znode_t *zp, uint64_t end) { zfsvfs_t *zfsvfs = ZTOZSB(zp); dmu_tx_t *tx; - locked_range_t *lr; + zfs_locked_range_t *lr; uint64_t newblksz; int error; @@ -1586,7 +1586,7 @@ static int zfs_free_range(znode_t *zp, uint64_t off, uint64_t len) { zfsvfs_t *zfsvfs = ZTOZSB(zp); - locked_range_t *lr; + zfs_locked_range_t *lr; int error; /* @@ -1666,7 +1666,7 @@ zfs_trunc(znode_t *zp, uint64_t end) { zfsvfs_t *zfsvfs = ZTOZSB(zp); dmu_tx_t *tx; - locked_range_t *lr; + zfs_locked_range_t *lr; int error; sa_bulk_attr_t bulk[2]; int count = 0; diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c index f234b8544..f1ed4f04e 100644 --- a/module/os/linux/zfs/zvol_os.c +++ b/module/os/linux/zfs/zvol_os.c @@ -57,7 +57,7 @@ static struct ida zvol_ida; typedef struct zv_request { zvol_state_t *zv; struct bio *bio; - locked_range_t *lr; + zfs_locked_range_t *lr; } zv_request_t; /* |