On 07/01/16(Thu) 17:51, Martin Pieuchot wrote:
> Since the introduction of the Dynamic Buffer Cache, cluster_write() is a
> noop. Since here it has never been enable, let's kill this code.
That's an easy one, any ok?
> Index: ufs/ext2fs/ext2fs_readwrite.c
> ===================================================================
> RCS file: /cvs/src/sys/ufs/ext2fs/ext2fs_readwrite.c,v
> retrieving revision 1.35
> diff -u -p -r1.35 ext2fs_readwrite.c
> --- ufs/ext2fs/ext2fs_readwrite.c 14 Mar 2015 03:38:52 -0000 1.35
> +++ ufs/ext2fs/ext2fs_readwrite.c 7 Jan 2016 16:38:02 -0000
> @@ -56,9 +56,6 @@
> static int ext2_ind_read(struct vnode *, struct inode *, struct m_ext2fs
> *, struct uio *);
> static int ext4_ext_read(struct vnode *, struct inode *, struct m_ext2fs
> *, struct uio *);
>
> -#define doclusterread 0 /* XXX underway */
> -#define doclusterwrite 0
> -
> /*
> * Vnode op for reading.
> */
> @@ -335,12 +332,9 @@ ext2fs_write(void *v)
> #endif
> if (ioflag & IO_SYNC)
> (void)bwrite(bp);
> - else if (xfersize + blkoffset == fs->e2fs_bsize) {
> - if (doclusterwrite)
> - cluster_write(bp, &ip->i_ci, ext2fs_size(ip));
> - else
> - bawrite(bp);
> - } else
> + else if (xfersize + blkoffset == fs->e2fs_bsize)
> + bawrite(bp);
> + else
> bdwrite(bp);
> if (error || xfersize == 0)
> break;
>
