X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzfs_ctldir.c;h=4fa530b6cacf63fa10a18783e6f63ec467c69c07;hb=5853fe790d1df58c5dd85ea52c5e165b6d43013c;hp=b5c4510fe8ded8e47ed4375e22919cffeb1dc533;hpb=761394b3af152895ac68a970a91a4f8a917c547b;p=zfs.git

diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
index b5c4510..4fa530b 100644
--- a/module/zfs/zfs_ctldir.c
+++ b/module/zfs/zfs_ctldir.c
@@ -197,6 +197,7 @@ zfsctl_inode_alloc(zfs_sb_t *zsb, uint64_t id,
 	zp->z_is_mapped = B_FALSE;
 	zp->z_is_ctldir = B_TRUE;
 	zp->z_is_sa = B_FALSE;
+	zp->z_is_stale = B_FALSE;
 	ip->i_ino = id;
 	ip->i_mode = (S_IFDIR | S_IRUGO | S_IXUGO);
 	ip->i_uid = 0;
@@ -442,7 +443,7 @@ zfsctl_snapdir_lookup(struct inode *dip, char *name, struct inode **ipp,
 
 	ZFS_ENTER(zsb);
 
-	error = dmu_snapshot_id(zsb->z_os, name, &id);
+	error = dmu_snapshot_lookup(zsb->z_os, name, &id);
 	if (error) {
 		ZFS_EXIT(zsb);
 		return (error);
@@ -685,7 +686,7 @@ zfsctl_snapdir_inactive(struct inode *ip)
 	"exec 0</dev/null " \
 	"     1>/dev/null " \
 	"     2>/dev/null; " \
-	"umount -t zfs -n '%s%s'"
+	"umount -t zfs -n %s'%s'"
 
 static int
 __zfsctl_unmount_snapshot(zfs_snapentry_t *sep, int flags)
@@ -908,7 +909,7 @@ zfsctl_lookup_objset(struct super_block *sb, uint64_t objsetid, zfs_sb_t **zsbp)
 	 */
 	sep = avl_first(&zsb->z_ctldir_snaps);
 	while (sep != NULL) {
-		error = dmu_snapshot_id(zsb->z_os, sep->se_name, &id);
+		error = dmu_snapshot_lookup(zsb->z_os, sep->se_name, &id);
 		if (error)
 			goto out;