Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

G/C struct znode -> z_moved 

The field is yet another leftover from unsupported zfs_znode_move.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Closes #11186
This commit is contained in:
Mateusz Guzik 2020-11-10 21:42:47 +01:00 committed by GitHub
parent 0f66201dbc
commit 1a0b4f566c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/os/linux/zfs/sys/trace_acl.h
View File

@ -52,7 +52,6 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
__field(uint8_t, z_unlinked) __field(uint8_t, z_unlinked)
__field(uint8_t, z_atime_dirty) __field(uint8_t, z_atime_dirty)
__field(uint8_t, z_zn_prefetch) __field(uint8_t, z_zn_prefetch)
__field(uint8_t, z_moved)
__field(uint_t, z_blksz) __field(uint_t, z_blksz)
__field(uint_t, z_seq) __field(uint_t, z_seq)
__field(uint64_t, z_mapcnt) __field(uint64_t, z_mapcnt)
@ -86,7 +85,6 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
__entry->z_unlinked = zn->z_unlinked; __entry->z_unlinked = zn->z_unlinked;
__entry->z_atime_dirty = zn->z_atime_dirty; __entry->z_atime_dirty = zn->z_atime_dirty;
__entry->z_zn_prefetch = zn->z_zn_prefetch; __entry->z_zn_prefetch = zn->z_zn_prefetch;
__entry->z_moved = zn->z_moved;
__entry->z_blksz = zn->z_blksz; __entry->z_blksz = zn->z_blksz;
__entry->z_seq = zn->z_seq; __entry->z_seq = zn->z_seq;
__entry->z_mapcnt = zn->z_mapcnt; __entry->z_mapcnt = zn->z_mapcnt;
@ -116,7 +114,7 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
__entry->mask_matched = mask_matched; __entry->mask_matched = mask_matched;
), ),
TP_printk("zn { id %llu unlinked %u atime_dirty %u " TP_printk("zn { id %llu unlinked %u atime_dirty %u "
"zn_prefetch %u moved %u blksz %u seq %u " "zn_prefetch %u blksz %u seq %u "
"mapcnt %llu size %llu pflags %llu " "mapcnt %llu size %llu pflags %llu "
"sync_cnt %u mode 0x%x is_sa %d " "sync_cnt %u mode 0x%x is_sa %d "
"is_mapped %d is_ctldir %d is_stale %d inode { " "is_mapped %d is_ctldir %d is_stale %d inode { "
@ -124,7 +122,7 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
"blkbits %u bytes %u mode 0x%x generation %x } } " "blkbits %u bytes %u mode 0x%x generation %x } } "
"ace { type %u flags %u access_mask %u } mask_matched %u", "ace { type %u flags %u access_mask %u } mask_matched %u",
__entry->z_id, __entry->z_unlinked, __entry->z_atime_dirty, __entry->z_id, __entry->z_unlinked, __entry->z_atime_dirty,
__entry->z_zn_prefetch, __entry->z_moved, __entry->z_blksz, __entry->z_zn_prefetch, __entry->z_blksz,
__entry->z_seq, __entry->z_mapcnt, __entry->z_size, __entry->z_seq, __entry->z_mapcnt, __entry->z_size,
__entry->z_pflags, __entry->z_sync_cnt, __entry->z_mode, __entry->z_pflags, __entry->z_sync_cnt, __entry->z_mode,
__entry->z_is_sa, __entry->z_is_mapped, __entry->z_is_sa, __entry->z_is_mapped,

1
include/sys/zfs_znode.h
View File

@ -187,7 +187,6 @@ typedef struct znode {
boolean_t z_unlinked; /* file has been unlinked */ boolean_t z_unlinked; /* file has been unlinked */
boolean_t z_atime_dirty; /* atime needs to be synced */ boolean_t z_atime_dirty; /* atime needs to be synced */
boolean_t z_zn_prefetch; /* Prefetch znodes? */ boolean_t z_zn_prefetch; /* Prefetch znodes? */
boolean_t z_moved; /* Has this znode been moved? */
boolean_t z_is_sa; /* are we native sa? */ boolean_t z_is_sa; /* are we native sa? */
boolean_t z_is_mapped; /* are we mmap'ed */ boolean_t z_is_mapped; /* are we mmap'ed */
boolean_t z_is_ctldir; /* are we .zfs entry */ boolean_t z_is_ctldir; /* are we .zfs entry */

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

@ -149,7 +149,6 @@ zfs_znode_cache_constructor(void *buf, void *arg, int kmflags)
zp->z_acl_cached = NULL; zp->z_acl_cached = NULL;
zp->z_vnode = NULL; zp->z_vnode = NULL;
zp->z_moved = 0;
return (0); return (0);
} }
@ -278,7 +277,6 @@ zfs_create_share_dir(zfsvfs_t *zfsvfs, dmu_tx_t *tx)
sharezp = zfs_znode_alloc_kmem(KM_SLEEP); sharezp = zfs_znode_alloc_kmem(KM_SLEEP);
ASSERT(!POINTER_IS_VALID(sharezp->z_zfsvfs)); ASSERT(!POINTER_IS_VALID(sharezp->z_zfsvfs));
sharezp->z_moved = 0;
sharezp->z_unlinked = 0; sharezp->z_unlinked = 0;
sharezp->z_atime_dirty = 0; sharezp->z_atime_dirty = 0;
sharezp->z_zfsvfs = zfsvfs; sharezp->z_zfsvfs = zfsvfs;
@ -437,7 +435,6 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
vp->v_data = zp; vp->v_data = zp;
ASSERT(!POINTER_IS_VALID(zp->z_zfsvfs)); ASSERT(!POINTER_IS_VALID(zp->z_zfsvfs));
zp->z_moved = 0;
zp->z_sa_hdl = NULL; zp->z_sa_hdl = NULL;
zp->z_unlinked = 0; zp->z_unlinked = 0;
@ -1692,7 +1689,6 @@ zfs_create_fs(objset_t *os, cred_t *cr, nvlist_t *zplprops, dmu_tx_t *tx)
rootzp = zfs_znode_alloc_kmem(KM_SLEEP); rootzp = zfs_znode_alloc_kmem(KM_SLEEP);
ASSERT(!POINTER_IS_VALID(rootzp->z_zfsvfs)); ASSERT(!POINTER_IS_VALID(rootzp->z_zfsvfs));
rootzp->z_moved = 0;
rootzp->z_unlinked = 0; rootzp->z_unlinked = 0;
rootzp->z_atime_dirty = 0; rootzp->z_atime_dirty = 0;
rootzp->z_is_sa = USE_SA(version, os); rootzp->z_is_sa = USE_SA(version, os);

1
module/os/linux/zfs/zfs_ctldir.c
View File

@ -467,7 +467,6 @@ zfsctl_inode_alloc(zfsvfs_t *zfsvfs, uint64_t id,
zp->z_unlinked = B_FALSE; zp->z_unlinked = B_FALSE;
zp->z_atime_dirty = B_FALSE; zp->z_atime_dirty = B_FALSE;
zp->z_zn_prefetch = B_FALSE; zp->z_zn_prefetch = B_FALSE;
zp->z_moved = B_FALSE;
zp->z_is_sa = B_FALSE; zp->z_is_sa = B_FALSE;
zp->z_is_mapped = B_FALSE; zp->z_is_mapped = B_FALSE;
zp->z_is_ctldir = B_TRUE; zp->z_is_ctldir = B_TRUE;

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

@ -134,7 +134,6 @@ zfs_znode_cache_constructor(void *buf, void *arg, int kmflags)
zp->z_acl_cached = NULL; zp->z_acl_cached = NULL;
zp->z_xattr_cached = NULL; zp->z_xattr_cached = NULL;
zp->z_xattr_parent = 0; zp->z_xattr_parent = 0;
zp->z_moved = B_FALSE;
return (0); return (0);
} }
@ -547,7 +546,6 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
ASSERT3P(zp->z_xattr_cached, ==, NULL); ASSERT3P(zp->z_xattr_cached, ==, NULL);
zp->z_unlinked = B_FALSE; zp->z_unlinked = B_FALSE;
zp->z_atime_dirty = B_FALSE; zp->z_atime_dirty = B_FALSE;
zp->z_moved = B_FALSE;
zp->z_is_mapped = B_FALSE; zp->z_is_mapped = B_FALSE;
zp->z_is_ctldir = B_FALSE; zp->z_is_ctldir = B_FALSE;
zp->z_is_stale = B_FALSE; zp->z_is_stale = B_FALSE;
@ -1901,7 +1899,6 @@ zfs_create_fs(objset_t *os, cred_t *cr, nvlist_t *zplprops, dmu_tx_t *tx)
rootzp = kmem_cache_alloc(znode_cache, KM_SLEEP); rootzp = kmem_cache_alloc(znode_cache, KM_SLEEP);
rootzp->z_unlinked = B_FALSE; rootzp->z_unlinked = B_FALSE;
rootzp->z_atime_dirty = B_FALSE; rootzp->z_atime_dirty = B_FALSE;
rootzp->z_moved = B_FALSE;
rootzp->z_is_sa = USE_SA(version, os); rootzp->z_is_sa = USE_SA(version, os);
rootzp->z_pflags = 0; rootzp->z_pflags = 0;