[src/trunk]: src/sys/fs/filecorefs blkoff() -> filecore_blkoff()

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9153f2339da6
branches:  trunk
changeset: 787469:9153f2339da6
user:      dholland <dholland%NetBSD.org@localhost>
date:      Wed Jun 19 18:16:10 2013 +0000

description:
blkoff() -> filecore_blkoff()
blksize() -> filecore_blksize()

diffstat:

 sys/fs/filecorefs/filecore_extern.h |   6 +++---
 sys/fs/filecorefs/filecore_vnops.c  |  10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (58 lines):

diff -r 6c006d322524 -r 9153f2339da6 sys/fs/filecorefs/filecore_extern.h
--- a/sys/fs/filecorefs/filecore_extern.h       Wed Jun 19 18:15:35 2013 +0000
+++ b/sys/fs/filecorefs/filecore_extern.h       Wed Jun 19 18:16:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filecore_extern.h,v 1.20 2011/05/23 22:00:30 rmind Exp $       */
+/*     $NetBSD: filecore_extern.h,v 1.21 2013/06/19 18:16:10 dholland Exp $    */
 
 /*-
  * Copyright (c) 1994 The Regents of the University of California.
@@ -96,10 +96,10 @@
 
 #define VFSTOFILECORE(mp)      ((struct filecore_mnt *)((mp)->mnt_data))
 
-#define blkoff(fcp, loc)       ((loc) & ((fcp)->blksize-1))
+#define filecore_blkoff(fcp, loc)      ((loc) & ((fcp)->blksize-1))
 #define lblktosize(fcp, blk)   ((blk) << (fcp)->log2bsize)
 #define lblkno(fcp, loc)       ((loc) >> (fcp)->log2bsize)
-#define blksize(fcp, ip, lbn)  ((fcp)->blksize)
+#define filecore_blksize(fcp, ip, lbn) ((fcp)->blksize)
 
 extern struct pool filecore_node_pool;
 
diff -r 6c006d322524 -r 9153f2339da6 sys/fs/filecorefs/filecore_vnops.c
--- a/sys/fs/filecorefs/filecore_vnops.c        Wed Jun 19 18:15:35 2013 +0000
+++ b/sys/fs/filecorefs/filecore_vnops.c        Wed Jun 19 18:16:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filecore_vnops.c,v 1.36 2013/03/18 19:35:36 plunky Exp $       */
+/*     $NetBSD: filecore_vnops.c,v 1.37 2013/06/19 18:16:10 dholland Exp $     */
 
 /*-
  * Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.36 2013/03/18 19:35:36 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.37 2013/06/19 18:16:10 dholland Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -240,14 +240,14 @@
 
        do {
                lbn = lblkno(fcmp, uio->uio_offset);
-               on = blkoff(fcmp, uio->uio_offset);
-               n = MIN(blksize(fcmp, ip, lbn) - on, uio->uio_resid);
+               on = filecore_blkoff(fcmp, uio->uio_offset);
+               n = MIN(filecore_blksize(fcmp, ip, lbn) - 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(fcmp, ip, lbn);
+               size = filecore_blksize(fcmp, ip, lbn);
                rablock = lbn + 1;
                if (ip->i_dirent.attr & FILECORE_ATTR_DIR) {
                        error = filecore_dbread(ip, &bp);