Deleted Added
full compact
cd9660_bmap.c (21673) cd9660_bmap.c (22521)
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley
6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
7 * Support code is derived from software contributed to Berkeley
8 * by Atsushi Murai (amurai@spec.co.jp).

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

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)cd9660_bmap.c 8.3 (Berkeley) 1/23/94
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley
6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
7 * Support code is derived from software contributed to Berkeley
8 * by Atsushi Murai (amurai@spec.co.jp).

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

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)cd9660_bmap.c 8.3 (Berkeley) 1/23/94
39 * $FreeBSD: head/sys/fs/cd9660/cd9660_bmap.c 21673 1997-01-14 07:20:47Z jkh $
39 * $FreeBSD: head/sys/fs/cd9660/cd9660_bmap.c 22521 1997-02-10 02:22:35Z dyson $
40 */
41
42#include <sys/param.h>
43#include <sys/namei.h>
44#include <sys/buf.h>
45#include <sys/file.h>
46#include <sys/vnode.h>
47#include <sys/mount.h>

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

62 struct vnode **a_vpp;
63 daddr_t *a_bnp;
64 int *a_runp;
65 int *a_runb;
66 } */ *ap;
67{
68 struct iso_node *ip = VTOI(ap->a_vp);
69 daddr_t lblkno = ap->a_bn;
40 */
41
42#include <sys/param.h>
43#include <sys/namei.h>
44#include <sys/buf.h>
45#include <sys/file.h>
46#include <sys/vnode.h>
47#include <sys/mount.h>

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

62 struct vnode **a_vpp;
63 daddr_t *a_bnp;
64 int *a_runp;
65 int *a_runb;
66 } */ *ap;
67{
68 struct iso_node *ip = VTOI(ap->a_vp);
69 daddr_t lblkno = ap->a_bn;
70 long bsize;
70 int bshift;
71
72 /*
73 * Check for underlying vnode requests and ensure that logical
74 * to physical mapping is requested.
75 */
76 if (ap->a_vpp != NULL)
77 *ap->a_vpp = ip->i_devvp;
78 if (ap->a_bnp == NULL)
79 return (0);
80
81 /*
82 * Compute the requested block number
83 */
71
72 /*
73 * Check for underlying vnode requests and ensure that logical
74 * to physical mapping is requested.
75 */
76 if (ap->a_vpp != NULL)
77 *ap->a_vpp = ip->i_devvp;
78 if (ap->a_bnp == NULL)
79 return (0);
80
81 /*
82 * Compute the requested block number
83 */
84 bsize = ip->i_mnt->logical_block_size;
85 *ap->a_bnp = (ip->iso_start + lblkno) * btodb(bsize);
84 bshift = ip->i_mnt->im_bshift;
85 *ap->a_bnp = (ip->iso_start + lblkno) << (bshift - DEV_BSHIFT);
86
87 /*
88 * Determine maximum number of readahead blocks following the
89 * requested block.
90 */
91 if (ap->a_runp) {
92 int nblk;
93
86
87 /*
88 * Determine maximum number of readahead blocks following the
89 * requested block.
90 */
91 if (ap->a_runp) {
92 int nblk;
93
94 nblk = (ip->i_size - (lblkno + 1) * bsize) / bsize;
94 nblk = (ip->i_size >> bshift) - (lblkno + 1);
95 if (nblk <= 0)
96 *ap->a_runp = 0;
95 if (nblk <= 0)
96 *ap->a_runp = 0;
97 else if (nblk >= MAXBSIZE/bsize)
98 *ap->a_runp = MAXBSIZE/bsize - 1;
97 else if (nblk >= (MAXBSIZE >> bshift))
98 *ap->a_runp = (MAXBSIZE >> bshift) - 1;
99 else
100 *ap->a_runp = nblk;
101 }
102
103 if (ap->a_runb) {
104 *ap->a_runb = 0;
105 }
106
107 return 0;
108}
99 else
100 *ap->a_runp = nblk;
101 }
102
103 if (ap->a_runb) {
104 *ap->a_runb = 0;
105 }
106
107 return 0;
108}