Enforce ARC meta-data limits

[zfs.git] / module / zfs / zfs_znode.c

diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c
index 1fe8849..edfb860 100644 (file)
--- a/module/zfs/zfs_znode.c
+++ b/module/zfs/zfs_znode.c
@@ -322,7 +322,8 @@ zfs_inode_set_ops(zfs_sb_t *zsb, struct inode *ip)
  */
 static znode_t *
 zfs_znode_alloc(zfs_sb_t *zsb, dmu_buf_t *db, int blksz,
-    dmu_object_type_t obj_type, uint64_t obj, sa_handle_t *hdl)
+    dmu_object_type_t obj_type, uint64_t obj, sa_handle_t *hdl,
+    struct dentry *dentry)
 {
        znode_t *zp;
        struct inode *ip;
@@ -379,6 +380,9 @@ zfs_znode_alloc(zfs_sb_t *zsb, dmu_buf_t *db, int blksz,
        if (insert_inode_locked(ip))
                goto error;
 
+       if (dentry)
+               d_instantiate(dentry, ip);
+
        mutex_enter(&zsb->z_znodes_lock);
        list_insert_tail(&zsb->z_all_znodes, zp);
        membar_producer();
@@ -675,7 +679,8 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
        VERIFY(sa_replace_all_by_template(sa_hdl, sa_attrs, cnt, tx) == 0);
 
        if (!(flag & IS_ROOT_NODE)) {
-               *zpp = zfs_znode_alloc(zsb, db, 0, obj_type, obj, sa_hdl);
+               *zpp = zfs_znode_alloc(zsb, db, 0, obj_type, obj, sa_hdl,
+                   vap->va_dentry);
                ASSERT(*zpp != NULL);
                ASSERT(dzp != NULL);
                err = zpl_xattr_security_init(ZTOI(*zpp), ZTOI(dzp));
@@ -806,14 +811,19 @@ zfs_zget(zfs_sb_t *zsb, uint64_t obj_num, znode_t **zpp)
        znode_t         *zp;
        int err;
        sa_handle_t     *hdl;
+       struct inode    *ip;
 
        *zpp = NULL;
 
+again:
+       ip = ilookup(zsb->z_sb, obj_num);
+
        ZFS_OBJ_HOLD_ENTER(zsb, obj_num);
 
        err = sa_buf_hold(zsb->z_os, obj_num, NULL, &db);
        if (err) {
                ZFS_OBJ_HOLD_EXIT(zsb, obj_num);
+               iput(ip);
                return (err);
        }
 
@@ -824,13 +834,27 @@ zfs_zget(zfs_sb_t *zsb, uint64_t obj_num, znode_t **zpp)
            doi.doi_bonus_size < sizeof (znode_phys_t)))) {
                sa_buf_rele(db, NULL);
                ZFS_OBJ_HOLD_EXIT(zsb, obj_num);
+               iput(ip);
                return (EINVAL);
        }
 
        hdl = dmu_buf_get_user(db);
        if (hdl != NULL) {
-               zp  = sa_get_userdata(hdl);
+               if (ip == NULL) {
+                       /*
+                        * ilookup returned NULL, which means
+                        * the znode is dying - but the SA handle isn't
+                        * quite dead yet, we need to drop any locks
+                        * we're holding, re-schedule the task and try again.
+                        */
+                       sa_buf_rele(db, NULL);
+                       ZFS_OBJ_HOLD_EXIT(zsb, obj_num);
+
+                       schedule();
+                       goto again;
+               }
 
+               zp = sa_get_userdata(hdl);
 
                /*
                 * Since "SA" does immediate eviction we
@@ -852,9 +876,12 @@ zfs_zget(zfs_sb_t *zsb, uint64_t obj_num, znode_t **zpp)
                sa_buf_rele(db, NULL);
                mutex_exit(&zp->z_lock);
                ZFS_OBJ_HOLD_EXIT(zsb, obj_num);
+               iput(ip);
                return (err);
        }
 
+       ASSERT3P(ip, ==, NULL);
+
        /*
         * Not found create new znode/vnode but only if file exists.
         *
@@ -866,7 +893,7 @@ zfs_zget(zfs_sb_t *zsb, uint64_t obj_num, znode_t **zpp)
         * bonus buffer.
         */
        zp = zfs_znode_alloc(zsb, db, doi.doi_data_block_size,
-           doi.doi_bonus_type, obj_num, NULL);
+           doi.doi_bonus_type, obj_num, NULL, NULL);
        if (zp == NULL) {
                err = ENOENT;
        } else {