cstyle: Resolve C style issues

[mirror_zfs.git] / module / zfs / zfs_vfsops.c

diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
index 5c65b964ae0d1c6670d3a658907109970b54d783..c64854d7b343d86428e7f0233bbfae9dcec6e945 100644 (file)
--- a/module/zfs/zfs_vfsops.c
+++ b/module/zfs/zfs_vfsops.c
@@ -1144,10 +1144,8 @@ zfs_sb_teardown(zfs_sb_t *zsb, boolean_t unmounting)
        mutex_enter(&zsb->z_znodes_lock);
        for (zp = list_head(&zsb->z_all_znodes); zp != NULL;
            zp = list_next(&zsb->z_all_znodes, zp)) {
-               if (zp->z_sa_hdl) {
-                       ASSERT(atomic_read(&ZTOI(zp)->i_count) > 0);
+               if (zp->z_sa_hdl)
                        zfs_znode_dmu_fini(zp);
-               }
        }
        mutex_exit(&zsb->z_znodes_lock);
 
@@ -1251,10 +1249,12 @@ zfs_domount(struct super_block *sb, void *data, int silent)
 
                atime_changed_cb(zsb, B_FALSE);
                readonly_changed_cb(zsb, B_TRUE);
-               if ((error = dsl_prop_get_integer(osname,"xattr",&pval,NULL)))
+               if ((error = dsl_prop_get_integer(osname,
+                   "xattr", &pval, NULL)))
                        goto out;
                xattr_changed_cb(zsb, pval);
-               if ((error = dsl_prop_get_integer(osname,"acltype",&pval,NULL)))
+               if ((error = dsl_prop_get_integer(osname,
+                   "acltype", &pval, NULL)))
                        goto out;
                acltype_changed_cb(zsb, pval);
                zsb->z_issnap = B_TRUE;