diff options
| author | John Gallagher <[email protected]> | 2018-08-02 14:03:56 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-08-02 14:03:56 -0700 |
| commit | 499b5497cbc62a4db35227bc98c6244454dfab4c (patch) | |
| tree | 1c99c8fb899c10fba9ba6a6028b644c0e061df6b /module/zfs | |
| parent | 010d12474cb1572c0c9b729615fa45cf43f59d14 (diff) | |
Add missing checks to zpl_xattr_* functions
Linux specific zpl_* entry points, such as xattrs, must include
the same unmounted and sa handle checks as the common zfs_ entry
points. The additional ZPL_* wrappers are identical to their
ZFS_ counterparts except the errno is negated since they are
expected to be used at the zpl_ layer.
Reviewed by: Matthew Ahrens <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: John Gallagher <[email protected]>
Closes #5866
Closes #7761
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/zpl_xattr.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c index 09e38ee8b..8ee6e9a97 100644 --- a/module/zfs/zpl_xattr.c +++ b/module/zfs/zpl_xattr.c @@ -245,7 +245,8 @@ zpl_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) crhold(cr); cookie = spl_fstrans_mark(); - rrm_enter_read(&(zfsvfs)->z_teardown_lock, FTAG); + ZPL_ENTER(zfsvfs); + ZPL_VERIFY_ZP(zp); rw_enter(&zp->z_xattr_lock, RW_READER); if (zfsvfs->z_use_sa && zp->z_is_sa) { @@ -262,7 +263,7 @@ zpl_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) out: rw_exit(&zp->z_xattr_lock); - rrm_exit(&(zfsvfs)->z_teardown_lock, FTAG); + ZPL_EXIT(zfsvfs); spl_fstrans_unmark(cookie); crfree(cr); @@ -418,11 +419,12 @@ zpl_xattr_get(struct inode *ip, const char *name, void *value, size_t size) crhold(cr); cookie = spl_fstrans_mark(); - rrm_enter_read(&(zfsvfs)->z_teardown_lock, FTAG); + ZPL_ENTER(zfsvfs); + ZPL_VERIFY_ZP(zp); rw_enter(&zp->z_xattr_lock, RW_READER); error = __zpl_xattr_get(ip, name, value, size, cr); rw_exit(&zp->z_xattr_lock); - rrm_exit(&(zfsvfs)->z_teardown_lock, FTAG); + ZPL_EXIT(zfsvfs); spl_fstrans_unmark(cookie); crfree(cr); @@ -590,7 +592,8 @@ zpl_xattr_set(struct inode *ip, const char *name, const void *value, crhold(cr); cookie = spl_fstrans_mark(); - rrm_enter_read(&(zfsvfs)->z_teardown_lock, FTAG); + ZPL_ENTER(zfsvfs); + ZPL_VERIFY_ZP(zp); rw_enter(&ITOZ(ip)->z_xattr_lock, RW_WRITER); /* @@ -643,7 +646,7 @@ zpl_xattr_set(struct inode *ip, const char *name, const void *value, zpl_xattr_set_sa(ip, name, NULL, 0, 0, cr); out: rw_exit(&ITOZ(ip)->z_xattr_lock); - rrm_exit(&(zfsvfs)->z_teardown_lock, FTAG); + ZPL_EXIT(zfsvfs); spl_fstrans_unmark(cookie); crfree(cr); ASSERT3S(error, <=, 0); |