hammer - Adjust hammer to new breadnx / cluster_readx API
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 9 Sep 2017 17:15:24 +0000 (10:15 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 9 Sep 2017 17:15:24 +0000 (10:15 -0700)
* API adjustments for breadnx() and cluster_readx() calls

sys/vfs/hammer/hammer_io.c
sys/vfs/hammer/hammer_vnops.c

index 2f02221..9a9516e 100644 (file)
@@ -1586,12 +1586,14 @@ hammer_io_indirect_read(hammer_mount_t hmp, struct bio *bio,
                        limit -= zone2_offset;
                        cluster_readcb(volume->devvp, limit, buf_offset,
                                       bp->b_bufsize,
+                                      B_NOTMETA,
                                       HAMMER_CLUSTER_SIZE,
                                       HAMMER_CLUSTER_SIZE * hce,
                                       hammer_indirect_callback,
                                       bio);
                } else {
                        breadcb(volume->devvp, buf_offset, bp->b_bufsize,
+                               B_NOTMETA,
                                hammer_indirect_callback, bio);
                }
        }
index f4a99cd..9b6b6fa 100644 (file)
@@ -412,10 +412,13 @@ hammer_vop_read(struct vop_read_args *ap)
                        }
                        error = cluster_readx(ap->a_vp,
                                             file_limit, base_offset,
-                                            blksize, uio->uio_resid,
-                                            seqcount * MAXBSIZE, &bp);
+                                            blksize, B_NOTMETA,
+                                            uio->uio_resid,
+                                            seqcount * MAXBSIZE,
+                                            &bp);
                } else {
-                       error = breadnx(ap->a_vp, base_offset, blksize,
+                       error = breadnx(ap->a_vp, base_offset,
+                                       blksize, B_NOTMETA,
                                        NULL, NULL, 0, &bp);
                }
                if (error) {