diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2013-03-14 20:28:26 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2013-03-14 20:28:26 +0000 |
| commit | c535690b33b611bb32371f99c64239485e7c1f1a (patch) | |
| tree | e8bc10388604a5af62ee23944945d21ddb0d1770 /sys/fs/ext2fs/ext2_vnops.c | |
| parent | 36a00a3f38e7504ff63b0c638b0d692c424a8235 (diff) | |
| download | src-c535690b33b611bb32371f99c64239485e7c1f1a.tar.gz src-c535690b33b611bb32371f99c64239485e7c1f1a.zip | |
Add currently unused flag argument to the cluster_read(),
cluster_write() and cluster_wbuild() functions. The flags to be
allowed are a subset of the GB_* flags for getblk().
Sponsored by: The FreeBSD Foundation
Tested by: pho
Notes
Notes:
svn path=/head/; revision=248282
Diffstat (limited to 'sys/fs/ext2fs/ext2_vnops.c')
| -rw-r--r-- | sys/fs/ext2fs/ext2_vnops.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c index 1c0b7a182e19..77eb74b2d6a8 100644 --- a/sys/fs/ext2fs/ext2_vnops.c +++ b/sys/fs/ext2fs/ext2_vnops.c @@ -1618,10 +1618,11 @@ ext2_read(struct vop_read_args *ap) if (lblktosize(fs, nextlbn) >= ip->i_size) error = bread(vp, lbn, size, NOCRED, &bp); - else if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0) + else if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0) { error = cluster_read(vp, ip->i_size, lbn, size, - NOCRED, blkoffset + uio->uio_resid, seqcount, &bp); - else if (seqcount > 1) { + NOCRED, blkoffset + uio->uio_resid, seqcount, + 0, &bp); + } else if (seqcount > 1) { int nextsize = blksize(fs, ip, nextlbn); error = breadn(vp, lbn, size, &nextlbn, &nextsize, 1, NOCRED, &bp); @@ -1831,7 +1832,7 @@ ext2_write(struct vop_write_args *ap) } else if (xfersize + blkoffset == fs->e2fs_fsize) { if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0) { bp->b_flags |= B_CLUSTEROK; - cluster_write(vp, bp, ip->i_size, seqcount); + cluster_write(vp, bp, ip->i_size, seqcount, 0); } else { bawrite(bp); } |