X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzfs_ctldir.c;h=c49d7172a26177bf0a177138f089bdccc3da7a5c;hb=04f9432d3bcb15ff8ed6ddc2dc377a4c0264340d;hp=01bf52fe9de2eb643307692b711c1b3a35803ff6;hpb=ebe7e575eae1e03b1faa545a424f008faeac589d;p=zfs.git

diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
index 01bf52f..c49d717 100644
--- a/module/zfs/zfs_ctldir.c
+++ b/module/zfs/zfs_ctldir.c
@@ -212,6 +212,7 @@ zfsctl_inode_alloc(zfs_sb_t *zsb, uint64_t id,
 
 	mutex_enter(&zsb->z_znodes_lock);
 	list_insert_tail(&zsb->z_all_znodes, zp);
+	zsb->z_nr_znodes++;
 	membar_producer();
 	mutex_exit(&zsb->z_znodes_lock);
 
@@ -224,13 +225,13 @@ zfsctl_inode_alloc(zfs_sb_t *zsb, uint64_t id,
  * Lookup the inode with given id, it will be allocated if needed.
  */
 static struct inode *
-zfsctl_inode_lookup(zfs_sb_t *zsb, unsigned long id,
+zfsctl_inode_lookup(zfs_sb_t *zsb, uint64_t id,
     const struct file_operations *fops, const struct inode_operations *ops)
 {
 	struct inode *ip = NULL;
 
 	while (ip == NULL) {
-		ip = ilookup(zsb->z_sb, id);
+		ip = ilookup(zsb->z_sb, (unsigned long)id);
 		if (ip)
 			break;
 
@@ -266,10 +267,14 @@ zfsctl_inode_inactive(struct inode *ip)
  * therefore checks against a vfs_count of 2 instead of 1.  This reference
  * is removed when the ctldir is destroyed in the unmount.  All other entities
  * under the '.zfs' directory are created dynamically as needed.
+ *
+ * Because the dynamically created '.zfs' directory entries assume the use
+ * of 64-bit inode numbers this support must be disabled on 32-bit systems.
  */
 int
 zfsctl_create(zfs_sb_t *zsb)
 {
+#if defined(CONFIG_64BIT)
 	ASSERT(zsb->z_ctldir == NULL);
 
 	zsb->z_ctldir = zfsctl_inode_alloc(zsb, ZFSCTL_INO_ROOT,
@@ -278,6 +283,9 @@ zfsctl_create(zfs_sb_t *zsb)
 		return (ENOENT);
 
 	return (0);
+#else
+	return (EOPNOTSUPP);
+#endif /* CONFIG_64BIT */
 }
 
 /*