[src/trunk]: src/sys/lib/libsa blkoff() -> mfs_blkoff()

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

details:   https://anonhg.NetBSD.org/src/rev/1084daa7e4ba
branches:  trunk
changeset: 787471:1084daa7e4ba
user:      dholland <dholland%NetBSD.org@localhost>
date:      Wed Jun 19 18:18:12 2013 +0000

description:
blkoff() -> mfs_blkoff()

XXX: this shouldn't be using "mfs" for its symbols as we also have
XXX: sys/ufs/mfs.

diffstat:

 sys/lib/libsa/minixfs3.c |  4 ++--
 sys/lib/libsa/minixfs3.h |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r a03d1c064d8c -r 1084daa7e4ba sys/lib/libsa/minixfs3.c
--- a/sys/lib/libsa/minixfs3.c  Wed Jun 19 18:16:53 2013 +0000
+++ b/sys/lib/libsa/minixfs3.c  Wed Jun 19 18:18:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: minixfs3.c,v 1.2 2013/06/19 17:51:26 dholland Exp $    */
+/*     $NetBSD: minixfs3.c,v 1.3 2013/06/19 18:18:12 dholland Exp $    */
 
 /*-
  * Copyright (c) 2012
@@ -358,7 +358,7 @@
        size_t block_size;
        int rc;
 
-       off = blkoff(fs, fp->f_seekp);
+       off = mfs_blkoff(fs, fp->f_seekp);
        file_block = lblkno(fs, fp->f_seekp);
        block_size = fs->mfs_block_size;
 
diff -r a03d1c064d8c -r 1084daa7e4ba sys/lib/libsa/minixfs3.h
--- a/sys/lib/libsa/minixfs3.h  Wed Jun 19 18:16:53 2013 +0000
+++ b/sys/lib/libsa/minixfs3.h  Wed Jun 19 18:18:12 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: minixfs3.h,v 1.2 2013/06/19 17:51:26 dholland Exp $ */
+/*     $NetBSD: minixfs3.h,v 1.3 2013/06/19 18:18:12 dholland Exp $ */
 
 /*-
  * Copyright (c) 2012
@@ -149,7 +149,7 @@
  * quantities by using shifts and masks in place of divisions
  * modulos and multiplications.
  */
-#define blkoff(fs, loc)                /* calculates (loc % fs->mfs_bsize) */ \
+#define mfs_blkoff(fs, loc)    /* calculates (loc % fs->mfs_bsize) */ \
        ((loc) & (fs)->mfs_qbmask)
 #define lblkno(fs, loc)                /* calculates (loc / fs->mfs_bsize) */ \
        ((loc) >> (fs)->mfs_bshift)