c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +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
8 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/os/linux/zfs/zfs_vfsops.c
+1 -1
View File
@@ -1772,7 +1772,7 @@ zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp)
*ipp = ZTOI(zp);
if (*ipp)
zfs_inode_update(ITOZ(*ipp));
zfs_znode_update_vfs(ITOZ(*ipp));
ZFS_EXIT(zfsvfs);
return (0);
module/os/linux/zfs/zfs_vnops_os.c
+21 -21
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);
if ((error == 0) && (*zpp))
zfs_inode_update(*zpp);
zfs_znode_update_vfs(*zpp);
ZFS_EXIT(zfsvfs);
return (error);
@@ -789,8 +789,8 @@ out:
if (zp)
zrele(zp);
} else {
zfs_inode_update(dzp);
zfs_inode_update(zp);
zfs_znode_update_vfs(dzp);
zfs_znode_update_vfs(zp);
*zpp = zp;
}
@@ -912,8 +912,8 @@ out:
if (zp)
zrele(zp);
} else {
zfs_inode_update(dzp);
zfs_inode_update(zp);
zfs_znode_update_vfs(dzp);
zfs_znode_update_vfs(zp);
*ipp = ZTOI(zp);
}
@@ -1139,8 +1139,8 @@ out:
pn_free(realnmp);
zfs_dirent_unlock(dl);
zfs_inode_update(dzp);
zfs_inode_update(zp);
zfs_znode_update_vfs(dzp);
zfs_znode_update_vfs(zp);
if (delete_now)
zrele(zp);
@@ -1148,7 +1148,7 @@ out:
zfs_zrele_async(zp);
if (xzp) {
zfs_inode_update(xzp);
zfs_znode_update_vfs(xzp);
zfs_zrele_async(xzp);
}
@@ -1345,8 +1345,8 @@ out:
if (error != 0) {
zrele(zp);
} else {
zfs_inode_update(dzp);
zfs_inode_update(zp);
zfs_znode_update_vfs(dzp);
zfs_znode_update_vfs(zp);
}
ZFS_EXIT(zfsvfs);
return (error);
@@ -1471,8 +1471,8 @@ top:
out:
zfs_dirent_unlock(dl);
zfs_inode_update(dzp);
zfs_inode_update(zp);
zfs_znode_update_vfs(dzp);
zfs_znode_update_vfs(zp);
zrele(zp);
if (zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS)
@@ -2542,7 +2542,7 @@ out:
err2 = zfs_setattr_dir(attrzp);
zrele(attrzp);
}
zfs_inode_update(zp);
zfs_znode_update_vfs(zp);
}
out2:
@@ -3000,17 +3000,17 @@ out:
zfs_dirent_unlock(sdl);
zfs_dirent_unlock(tdl);
zfs_inode_update(sdzp);
zfs_znode_update_vfs(sdzp);
if (sdzp == tdzp)
rw_exit(&sdzp->z_name_lock);
if (sdzp != tdzp)
zfs_inode_update(tdzp);
zfs_znode_update_vfs(tdzp);
zfs_inode_update(szp);
zfs_znode_update_vfs(szp);
zrele(szp);
if (tzp) {
zfs_inode_update(tzp);
zfs_znode_update_vfs(tzp);
zrele(tzp);
}
@@ -3169,8 +3169,8 @@ top:
txtype |= TX_CI;
zfs_log_symlink(zilog, tx, txtype, dzp, zp, name, link);
zfs_inode_update(dzp);
zfs_inode_update(zp);
zfs_znode_update_vfs(dzp);
zfs_znode_update_vfs(zp);
}
zfs_acl_ids_free(&acl_ids);
@@ -3419,8 +3419,8 @@ top:
if (is_tmpfile && zfsvfs->z_os->os_sync != ZFS_SYNC_DISABLED)
txg_wait_synced(dmu_objset_pool(zfsvfs->z_os), txg);
zfs_inode_update(tdzp);
zfs_inode_update(szp);
zfs_znode_update_vfs(tdzp);
zfs_znode_update_vfs(szp);
ZFS_EXIT(zfsvfs);
return (error);
}
module/os/linux/zfs/zfs_znode.c
+5 -9
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
* 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.
* Update the embedded inode given the znode.
*/
void
zfs_inode_update(znode_t *zp)
zfs_znode_update_vfs(znode_t *zp)
{
zfsvfs_t *zfsvfs;
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);
ip->i_ino = zp->z_id;
zfs_inode_update(zp);
zfs_znode_update_vfs(zp);
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_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
@@ -1796,7 +1792,7 @@ log:
dmu_tx_commit(tx);
zfs_inode_update(zp);
zfs_znode_update_vfs(zp);
error = 0;
out: