Merge branch 'zpl'

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

diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index 8bff0ef..b20e3b2 100644 (file)
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -2575,7 +2575,7 @@ out:
        } else {
                err2 = sa_bulk_update(zp->z_sa_hdl, bulk, count, tx);
                dmu_tx_commit(tx);
-                zfs_inode_update(zp);
+               zfs_inode_update(zp);
        }
 
 out2:
@@ -3169,7 +3169,6 @@ top:
        zfs_dirent_unlock(dl);
 
        *ipp = ZTOI(zp);
-       iput(ZTOI(zp));
 
        if (zsb->z_os->os_sync == ZFS_SYNC_ALWAYS)
                zil_commit(zilog, 0);