Deleted Added
full compact
ext2_vnops.c (254283) ext2_vnops.c (257029)
1/*-
2 * modified for EXT2FS support in Lites 1.1
3 *
4 * Aug 1995, Godmar Back (gback@cs.utah.edu)
5 * University of Utah, Department of Computer Science
6 */
7/*-
8 * Copyright (c) 1982, 1986, 1989, 1993

--- 25 unchanged lines hidden (view full) ---

34 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
35 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
36 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
37 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
38 * SUCH DAMAGE.
39 *
40 * @(#)ufs_vnops.c 8.7 (Berkeley) 2/3/94
41 * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
1/*-
2 * modified for EXT2FS support in Lites 1.1
3 *
4 * Aug 1995, Godmar Back (gback@cs.utah.edu)
5 * University of Utah, Department of Computer Science
6 */
7/*-
8 * Copyright (c) 1982, 1986, 1989, 1993

--- 25 unchanged lines hidden (view full) ---

34 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
35 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
36 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
37 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
38 * SUCH DAMAGE.
39 *
40 * @(#)ufs_vnops.c 8.7 (Berkeley) 2/3/94
41 * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
42 * $FreeBSD: head/sys/fs/ext2fs/ext2_vnops.c 254283 2013-08-13 15:40:43Z pfg $
42 * $FreeBSD: head/sys/fs/ext2fs/ext2_vnops.c 257029 2013-10-24 00:33:29Z pfg $
43 */
44
45#include "opt_suiddir.h"
46
47#include <sys/param.h>
48#include <sys/systm.h>
49#include <sys/kernel.h>
50#include <sys/fcntl.h>

--- 1633 unchanged lines hidden (view full) ---

1684
1685 if (lblktosize(fs, nextlbn) >= ip->i_size)
1686 error = bread(vp, lbn, size, NOCRED, &bp);
1687 else if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0) {
1688 error = cluster_read(vp, ip->i_size, lbn, size,
1689 NOCRED, blkoffset + uio->uio_resid, seqcount,
1690 0, &bp);
1691 } else if (seqcount > 1) {
43 */
44
45#include "opt_suiddir.h"
46
47#include <sys/param.h>
48#include <sys/systm.h>
49#include <sys/kernel.h>
50#include <sys/fcntl.h>

--- 1633 unchanged lines hidden (view full) ---

1684
1685 if (lblktosize(fs, nextlbn) >= ip->i_size)
1686 error = bread(vp, lbn, size, NOCRED, &bp);
1687 else if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0) {
1688 error = cluster_read(vp, ip->i_size, lbn, size,
1689 NOCRED, blkoffset + uio->uio_resid, seqcount,
1690 0, &bp);
1691 } else if (seqcount > 1) {
1692 int nextsize = blksize(fs, ip, nextlbn);
1692 u_int nextsize = blksize(fs, ip, nextlbn);
1693 error = breadn(vp, lbn,
1694 size, &nextlbn, &nextsize, 1, NOCRED, &bp);
1695 } else
1696 error = bread(vp, lbn, size, NOCRED, &bp);
1697 if (error) {
1698 brelse(bp);
1699 bp = NULL;
1700 break;

--- 365 unchanged lines hidden ---
1693 error = breadn(vp, lbn,
1694 size, &nextlbn, &nextsize, 1, NOCRED, &bp);
1695 } else
1696 error = bread(vp, lbn, size, NOCRED, &bp);
1697 if (error) {
1698 brelse(bp);
1699 bp = NULL;
1700 break;

--- 365 unchanged lines hidden ---