Module Name: src Committed By: dholland Date: Wed Jun 19 18:18:12 UTC 2013
Modified Files: src/sys/lib/libsa: minixfs3.c minixfs3.h Log Message: blkoff() -> mfs_blkoff() XXX: this shouldn't be using "mfs" for its symbols as we also have XXX: sys/ufs/mfs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libsa/minixfs3.c \ src/sys/lib/libsa/minixfs3.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/lib/libsa/minixfs3.c diff -u src/sys/lib/libsa/minixfs3.c:1.2 src/sys/lib/libsa/minixfs3.c:1.3 --- src/sys/lib/libsa/minixfs3.c:1.2 Wed Jun 19 17:51:26 2013 +++ src/sys/lib/libsa/minixfs3.c Wed Jun 19 18:18:12 2013 @@ -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 @@ buf_read_file(struct open_file *f, void 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; Index: src/sys/lib/libsa/minixfs3.h diff -u src/sys/lib/libsa/minixfs3.h:1.2 src/sys/lib/libsa/minixfs3.h:1.3 --- src/sys/lib/libsa/minixfs3.h:1.2 Wed Jun 19 17:51:26 2013 +++ src/sys/lib/libsa/minixfs3.h Wed Jun 19 18:18:12 2013 @@ -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 @@ void minixfs3_i_bswap(struct mfs_dinode * 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)