From 657ce253575295ef680eb33cf4ef698548212a46 Mon Sep 17 00:00:00 2001 From: Matthew Macy Date: Wed, 11 Dec 2019 11:53:57 -0800 Subject: Eliminate Linux specific inode usage from common code Change many of the znops routines to take a znode rather than an inode so that zfs_replay code can be largely shared and in the future the much of the znops code may be shared. Reviewed-by: Jorgen Lundman Reviewed-by: Brian Behlendorf Signed-off-by: Matt Macy Closes #9708 --- module/os/linux/zfs/zfs_ctldir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/os/linux/zfs/zfs_ctldir.c') diff --git a/module/os/linux/zfs/zfs_ctldir.c b/module/os/linux/zfs/zfs_ctldir.c index 909748f51..c2748ce45 100644 --- a/module/os/linux/zfs/zfs_ctldir.c +++ b/module/os/linux/zfs/zfs_ctldir.c @@ -1185,7 +1185,7 @@ zfsctl_shares_lookup(struct inode *dip, char *name, struct inode **ipp, int flags, cred_t *cr, int *direntflags, pathname_t *realpnp) { zfsvfs_t *zfsvfs = ITOZSB(dip); - struct inode *ip; + znode_t *zp; znode_t *dzp; int error; @@ -1197,8 +1197,8 @@ zfsctl_shares_lookup(struct inode *dip, char *name, struct inode **ipp, } if ((error = zfs_zget(zfsvfs, zfsvfs->z_shares_dir, &dzp)) == 0) { - error = zfs_lookup(ZTOI(dzp), name, &ip, 0, cr, NULL, NULL); - iput(ZTOI(dzp)); + error = zfs_lookup(dzp, name, &zp, 0, cr, NULL, NULL); + zrele(dzp); } ZFS_EXIT(zfsvfs); -- cgit v1.2.3