c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 03:19:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous code cleanup

Browse Source 
Remove some extra whitespace.

Use pointer-typed asserts in Linux's znode cache destructor for more
info when debugging.

Simplify a couple of conversions from inode to znode when we already
have the znode.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #11974
This commit is contained in:
Ryan Moeller 2021-04-30 19:39:07 -04:00 committed by GitHub
parent e4efb70950
commit c903a756ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/os/freebsd/zfs/zfs_znode.c
View File

@ -175,14 +175,12 @@ static int
zfs_znode_cache_constructor_smr(void *mem, int size __unused, void *private, zfs_znode_cache_constructor_smr(void *mem, int size __unused, void *private,
int flags) int flags)
{ {
return (zfs_znode_cache_constructor(mem, private, flags)); return (zfs_znode_cache_constructor(mem, private, flags));
} }
static void static void
zfs_znode_cache_destructor_smr(void *mem, int size __unused, void *private) zfs_znode_cache_destructor_smr(void *mem, int size __unused, void *private)
{ {
zfs_znode_cache_destructor(mem, private); zfs_znode_cache_destructor(mem, private);
} }
@ -202,7 +200,6 @@ zfs_znode_init(void)
static znode_t * static znode_t *
zfs_znode_alloc_kmem(int flags) zfs_znode_alloc_kmem(int flags)
{ {
return (uma_zalloc_smr(znode_uma_zone, flags)); return (uma_zalloc_smr(znode_uma_zone, flags));
} }
@ -228,7 +225,6 @@ zfs_znode_init(void)
static znode_t * static znode_t *
zfs_znode_alloc_kmem(int flags) zfs_znode_alloc_kmem(int flags)
{ {
return (kmem_cache_alloc(znode_cache, flags)); return (kmem_cache_alloc(znode_cache, flags));
} }

6
module/os/linux/zfs/zfs_znode.c
View File

@ -151,9 +151,9 @@ zfs_znode_cache_destructor(void *buf, void *arg)
rw_destroy(&zp->z_xattr_lock); rw_destroy(&zp->z_xattr_lock);
zfs_rangelock_fini(&zp->z_rangelock); zfs_rangelock_fini(&zp->z_rangelock);
ASSERT(zp->z_dirlocks == NULL); ASSERT3P(zp->z_dirlocks, ==, NULL);
ASSERT(zp->z_acl_cached == NULL); ASSERT3P(zp->z_acl_cached, ==, NULL);
ASSERT(zp->z_xattr_cached == NULL); ASSERT3P(zp->z_xattr_cached, ==, NULL);
} }
static int static int

4
module/os/linux/zfs/zpl_xattr.c
View File

@ -605,7 +605,7 @@ zpl_xattr_set(struct inode *ip, const char *name, const void *value,
cookie = spl_fstrans_mark(); cookie = spl_fstrans_mark();
ZPL_ENTER(zfsvfs); ZPL_ENTER(zfsvfs);
ZPL_VERIFY_ZP(zp); ZPL_VERIFY_ZP(zp);
rw_enter(&ITOZ(ip)->z_xattr_lock, RW_WRITER); rw_enter(&zp->z_xattr_lock, RW_WRITER);
/* /*
* Before setting the xattr check to see if it already exists. * Before setting the xattr check to see if it already exists.
@ -656,7 +656,7 @@ zpl_xattr_set(struct inode *ip, const char *name, const void *value,
if (error == 0 && (where & XATTR_IN_SA)) if (error == 0 && (where & XATTR_IN_SA))
zpl_xattr_set_sa(ip, name, NULL, 0, 0, cr); zpl_xattr_set_sa(ip, name, NULL, 0, 0, cr);
out: out:
rw_exit(&ITOZ(ip)->z_xattr_lock); rw_exit(&zp->z_xattr_lock);
ZPL_EXIT(zfsvfs); ZPL_EXIT(zfsvfs);
spl_fstrans_unmark(cookie); spl_fstrans_unmark(cookie);
crfree(cr); crfree(cr);