c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-12 11:10:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename zfs_inode_update to zfs_znode_update_vfs

Browse Source 
zfs_znode_update_vfs is a more platform-agnostic name than
zfs_inode_update. Besides that, the function's prototype is moved to
include/sys/zfs_znode.h as the function is also used in common code.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ka Ho Ng <khng300@gmail.com>
Sponsored by: The FreeBSD Foundation
Closes #11580
This commit is contained in:
khng300 2021-02-10 03:17:29 +08:00 committed by GitHub
parent 4f22619ae3
commit fc273894d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/os/freebsd/zfs/sys/zfs_znode_impl.h
View File

@ -180,7 +180,6 @@ extern int zfsfstype;
extern int zfs_znode_parent_and_name(struct znode *zp, struct znode **dzpp, extern int zfs_znode_parent_and_name(struct znode *zp, struct znode **dzpp,
char *buf); char *buf);
extern void zfs_inode_update(struct znode *);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

1
include/os/linux/zfs/sys/zfs_znode_impl.h
View File

@ -158,7 +158,6 @@ struct znode;
extern int zfs_sync(struct super_block *, int, cred_t *); extern int zfs_sync(struct super_block *, int, cred_t *);
extern int zfs_inode_alloc(struct super_block *, struct inode **ip); extern int zfs_inode_alloc(struct super_block *, struct inode **ip);
extern void zfs_inode_destroy(struct inode *); extern void zfs_inode_destroy(struct inode *);
extern void zfs_inode_update(struct znode *);
extern void zfs_mark_inode_dirty(struct inode *); extern void zfs_mark_inode_dirty(struct inode *);
extern boolean_t zfs_relatime_need_update(const struct inode *); extern boolean_t zfs_relatime_need_update(const struct inode *);

2
include/sys/zfs_znode.h
View File

@ -287,6 +287,8 @@ extern void zfs_log_acl(zilog_t *zilog, dmu_tx_t *tx, znode_t *zp,
extern void zfs_xvattr_set(znode_t *zp, xvattr_t *xvap, dmu_tx_t *tx); extern void zfs_xvattr_set(znode_t *zp, xvattr_t *xvap, dmu_tx_t *tx);
extern void zfs_upgrade(zfsvfs_t *zfsvfs, dmu_tx_t *tx); extern void zfs_upgrade(zfsvfs_t *zfsvfs, dmu_tx_t *tx);
extern void zfs_znode_update_vfs(struct znode *);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }

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

@ -2015,7 +2015,7 @@ zfs_obj_to_stats(objset_t *osp, uint64_t obj, zfs_stat_t *sb,
void void
zfs_inode_update(znode_t *zp) zfs_znode_update_vfs(znode_t *zp)
{ {
vm_object_t object; vm_object_t object;

2
module/os/linux/zfs/zfs_vfsops.c
View File

@ -1772,7 +1772,7 @@ zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp)
*ipp = ZTOI(zp); *ipp = ZTOI(zp);
if (*ipp) if (*ipp)
zfs_inode_update(ITOZ(*ipp)); zfs_znode_update_vfs(ITOZ(*ipp));
ZFS_EXIT(zfsvfs); ZFS_EXIT(zfsvfs);
return (0); return (0);

42
module/os/linux/zfs/zfs_vnops_os.c
View File

@ -526,7 +526,7 @@ zfs_lookup(znode_t *zdp, char *nm, znode_t **zpp, int flags, cred_t *cr,
error = zfs_dirlook(zdp, nm, zpp, flags, direntflags, realpnp); error = zfs_dirlook(zdp, nm, zpp, flags, direntflags, realpnp);
if ((error == 0) && (*zpp)) if ((error == 0) && (*zpp))
zfs_inode_update(*zpp); zfs_znode_update_vfs(*zpp);
ZFS_EXIT(zfsvfs); ZFS_EXIT(zfsvfs);
return (error); return (error);
@ -789,8 +789,8 @@ out:
if (zp) if (zp)
zrele(zp); zrele(zp);
} else { } else {
zfs_inode_update(dzp); zfs_znode_update_vfs(dzp);
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
*zpp = zp; *zpp = zp;
} }
@ -912,8 +912,8 @@ out:
if (zp) if (zp)
zrele(zp); zrele(zp);
} else { } else {
zfs_inode_update(dzp); zfs_znode_update_vfs(dzp);
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
*ipp = ZTOI(zp); *ipp = ZTOI(zp);
} }
@ -1139,8 +1139,8 @@ out:
pn_free(realnmp); pn_free(realnmp);
zfs_dirent_unlock(dl); zfs_dirent_unlock(dl);
zfs_inode_update(dzp); zfs_znode_update_vfs(dzp);
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
if (delete_now) if (delete_now)
zrele(zp); zrele(zp);
@ -1148,7 +1148,7 @@ out:
zfs_zrele_async(zp); zfs_zrele_async(zp);
if (xzp) { if (xzp) {
zfs_inode_update(xzp); zfs_znode_update_vfs(xzp);
zfs_zrele_async(xzp); zfs_zrele_async(xzp);
} }
@ -1345,8 +1345,8 @@ out:
if (error != 0) { if (error != 0) {
zrele(zp); zrele(zp);
} else { } else {
zfs_inode_update(dzp); zfs_znode_update_vfs(dzp);
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
} }
ZFS_EXIT(zfsvfs); ZFS_EXIT(zfsvfs);
return (error); return (error);
@ -1471,8 +1471,8 @@ top:
out: out:
zfs_dirent_unlock(dl); zfs_dirent_unlock(dl);
zfs_inode_update(dzp); zfs_znode_update_vfs(dzp);
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
zrele(zp); zrele(zp);
if (zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS) if (zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS)
@ -2542,7 +2542,7 @@ out:
err2 = zfs_setattr_dir(attrzp); err2 = zfs_setattr_dir(attrzp);
zrele(attrzp); zrele(attrzp);
} }
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
} }
out2: out2:
@ -3000,17 +3000,17 @@ out:
zfs_dirent_unlock(sdl); zfs_dirent_unlock(sdl);
zfs_dirent_unlock(tdl); zfs_dirent_unlock(tdl);
zfs_inode_update(sdzp); zfs_znode_update_vfs(sdzp);
if (sdzp == tdzp) if (sdzp == tdzp)
rw_exit(&sdzp->z_name_lock); rw_exit(&sdzp->z_name_lock);
if (sdzp != tdzp) if (sdzp != tdzp)
zfs_inode_update(tdzp); zfs_znode_update_vfs(tdzp);
zfs_inode_update(szp); zfs_znode_update_vfs(szp);
zrele(szp); zrele(szp);
if (tzp) { if (tzp) {
zfs_inode_update(tzp); zfs_znode_update_vfs(tzp);
zrele(tzp); zrele(tzp);
} }
@ -3169,8 +3169,8 @@ top:
txtype |= TX_CI; txtype |= TX_CI;
zfs_log_symlink(zilog, tx, txtype, dzp, zp, name, link); zfs_log_symlink(zilog, tx, txtype, dzp, zp, name, link);
zfs_inode_update(dzp); zfs_znode_update_vfs(dzp);
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
} }
zfs_acl_ids_free(&acl_ids); zfs_acl_ids_free(&acl_ids);
@ -3419,8 +3419,8 @@ top:
if (is_tmpfile && zfsvfs->z_os->os_sync != ZFS_SYNC_DISABLED) if (is_tmpfile && zfsvfs->z_os->os_sync != ZFS_SYNC_DISABLED)
txg_wait_synced(dmu_objset_pool(zfsvfs->z_os), txg); txg_wait_synced(dmu_objset_pool(zfsvfs->z_os), txg);
zfs_inode_update(tdzp); zfs_znode_update_vfs(tdzp);
zfs_inode_update(szp); zfs_znode_update_vfs(szp);
ZFS_EXIT(zfsvfs); ZFS_EXIT(zfsvfs);
return (error); return (error);
} }

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

@ -479,14 +479,10 @@ zfs_set_inode_flags(znode_t *zp, struct inode *ip)
} }
/* /*
* Update the embedded inode given the znode. We should work toward * Update the embedded inode given the znode.
* eliminating this function as soon as possible by removing values
* which are duplicated between the znode and inode. If the generic
* inode has the correct field it should be used, and the ZFS code
* updated to access the inode. This can be done incrementally.
*/ */
void void
zfs_inode_update(znode_t *zp) zfs_znode_update_vfs(znode_t *zp)
{ {
zfsvfs_t *zfsvfs; zfsvfs_t *zfsvfs;
struct inode *ip; struct inode *ip;
@ -602,7 +598,7 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
ZFS_TIME_DECODE(&ip->i_ctime, ctime); ZFS_TIME_DECODE(&ip->i_ctime, ctime);
ip->i_ino = zp->z_id; ip->i_ino = zp->z_id;
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
zfs_inode_set_ops(zfsvfs, ip); zfs_inode_set_ops(zfsvfs, ip);
/* /*
@ -1278,7 +1274,7 @@ zfs_rezget(znode_t *zp)
zp->z_blksz = doi.doi_data_block_size; zp->z_blksz = doi.doi_data_block_size;
zp->z_atime_dirty = B_FALSE; zp->z_atime_dirty = B_FALSE;
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
/* /*
* If the file has zero links, then it has been unlinked on the send * If the file has zero links, then it has been unlinked on the send
@ -1796,7 +1792,7 @@ log:
dmu_tx_commit(tx); dmu_tx_commit(tx);
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
error = 0; error = 0;
out: out:

2
module/zfs/zfs_vnops.c
View File

@ -665,7 +665,7 @@ zfs_write(znode_t *zp, zfs_uio_t *uio, int ioflag, cred_t *cr)
} }
} }
zfs_inode_update(zp); zfs_znode_update_vfs(zp);
zfs_rangelock_exit(lr); zfs_rangelock_exit(lr);
/* /*