high_crc = crc32c(high_crc, &lenum, sizeof(lenum));
        lenum = cpu_to_le64(ref_generation);
        low_crc = crc32c(low_crc, &lenum, sizeof(lenum));
-
-#if 0
-       lenum = cpu_to_le64(owner);
-       low_crc = crc32c(low_crc, &lenum, sizeof(lenum));
-       lenum = cpu_to_le64(owner_offset);
-       low_crc = crc32c(low_crc, &lenum, sizeof(lenum));
-#endif
+       if (owner >= BTRFS_FIRST_FREE_OBJECTID) {
+               lenum = cpu_to_le64(owner);
+               low_crc = crc32c(low_crc, &lenum, sizeof(lenum));
+               lenum = cpu_to_le64(owner_offset);
+               low_crc = crc32c(low_crc, &lenum, sizeof(lenum));
+       }
        return ((u64)high_crc << 32) | (u64)low_crc;
 }