Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/fs/cd9660 blkoff() -> cd9660_blkoff()
details: https://anonhg.NetBSD.org/src/rev/a03d1c064d8c
branches: trunk
changeset: 787470:a03d1c064d8c
user: dholland <dholland%NetBSD.org@localhost>
date: Wed Jun 19 18:16:53 2013 +0000
description:
blkoff() -> cd9660_blkoff()
blksize() -> cd9660_blksize()
diffstat:
sys/fs/cd9660/cd9660_extern.h | 6 +++---
sys/fs/cd9660/cd9660_lookup.c | 8 ++++----
sys/fs/cd9660/cd9660_vfsops.c | 6 +++---
sys/fs/cd9660/cd9660_vnops.c | 10 +++++-----
4 files changed, 15 insertions(+), 15 deletions(-)
diffs (123 lines):
diff -r 9153f2339da6 -r a03d1c064d8c sys/fs/cd9660/cd9660_extern.h
--- a/sys/fs/cd9660/cd9660_extern.h Wed Jun 19 18:16:10 2013 +0000
+++ b/sys/fs/cd9660/cd9660_extern.h Wed Jun 19 18:16:53 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_extern.h,v 1.24 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: cd9660_extern.h,v 1.25 2013/06/19 18:16:53 dholland Exp $ */
/*-
* Copyright (c) 1994
@@ -85,10 +85,10 @@
#define VFSTOISOFS(mp) ((struct iso_mnt *)((mp)->mnt_data))
-#define blkoff(imp, loc) ((loc) & (imp)->im_bmask)
+#define cd9660_blkoff(imp, loc) ((loc) & (imp)->im_bmask)
#define lblktosize(imp, blk) ((blk) << (imp)->im_bshift)
#define lblkno(imp, loc) ((loc) >> (imp)->im_bshift)
-#define blksize(imp, ip, lbn) ((imp)->logical_block_size)
+#define cd9660_blksize(imp, ip, lbn) ((imp)->logical_block_size)
#ifdef _KERNEL
diff -r 9153f2339da6 -r a03d1c064d8c sys/fs/cd9660/cd9660_lookup.c
--- a/sys/fs/cd9660/cd9660_lookup.c Wed Jun 19 18:16:10 2013 +0000
+++ b/sys/fs/cd9660/cd9660_lookup.c Wed Jun 19 18:16:53 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_lookup.c,v 1.23 2012/12/20 08:03:42 hannken Exp $ */
+/* $NetBSD: cd9660_lookup.c,v 1.24 2013/06/19 18:16:53 dholland Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.23 2012/12/20 08:03:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.24 2013/06/19 18:16:53 dholland Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@@ -422,14 +422,14 @@
ip = VTOI(vp);
imp = ip->i_mnt;
lbn = lblkno(imp, offset);
- bsize = blksize(imp, ip, lbn);
+ bsize = cd9660_blksize(imp, ip, lbn);
if ((error = bread(vp, lbn, bsize, NOCRED, 0, &bp)) != 0) {
*bpp = NULL;
return (error);
}
if (res)
- *res = (char *)bp->b_data + blkoff(imp, offset);
+ *res = (char *)bp->b_data + cd9660_blkoff(imp, offset);
*bpp = bp;
return (0);
}
diff -r 9153f2339da6 -r a03d1c064d8c sys/fs/cd9660/cd9660_vfsops.c
--- a/sys/fs/cd9660/cd9660_vfsops.c Wed Jun 19 18:16:10 2013 +0000
+++ b/sys/fs/cd9660/cd9660_vfsops.c Wed Jun 19 18:16:53 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vfsops.c,v 1.76 2012/12/20 08:03:42 hannken Exp $ */
+/* $NetBSD: cd9660_vfsops.c,v 1.77 2013/06/19 18:16:53 dholland Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.76 2012/12/20 08:03:42 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.77 2013/06/19 18:16:53 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -766,7 +766,7 @@
return (ESTALE);
}
- off = blkoff(imp, ino);
+ off = cd9660_blkoff(imp, ino);
if (off + ISO_DIRECTORY_RECORD_SIZE > imp->logical_block_size) {
vput(vp);
printf("fhtovp: crosses block boundary %d\n",
diff -r 9153f2339da6 -r a03d1c064d8c sys/fs/cd9660/cd9660_vnops.c
--- a/sys/fs/cd9660/cd9660_vnops.c Wed Jun 19 18:16:10 2013 +0000
+++ b/sys/fs/cd9660/cd9660_vnops.c Wed Jun 19 18:16:53 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vnops.c,v 1.43 2013/03/18 19:35:35 plunky Exp $ */
+/* $NetBSD: cd9660_vnops.c,v 1.44 2013/06/19 18:16:53 dholland Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.43 2013/03/18 19:35:35 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.44 2013/06/19 18:16:53 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -250,17 +250,17 @@
do {
lbn = lblkno(imp, uio->uio_offset);
- on = blkoff(imp, uio->uio_offset);
+ on = cd9660_blkoff(imp, uio->uio_offset);
n = MIN(imp->logical_block_size - on, uio->uio_resid);
diff = (off_t)ip->i_size - uio->uio_offset;
if (diff <= 0)
return (0);
if (diff < n)
n = diff;
- size = blksize(imp, ip, lbn);
+ size = cd9660_blksize(imp, ip, lbn);
rablock = lbn + 1;
if (lblktosize(imp, rablock) < ip->i_size) {
- rasize = blksize(imp, ip, rablock);
+ rasize = cd9660_blksize(imp, ip, rablock);
error = breadn(vp, lbn, size, &rablock,
&rasize, 1, NOCRED, 0, &bp);
} else {
Home |
Main Index |
Thread Index |
Old Index