Module Name: src
Committed By: dholland
Date: Wed Jun 19 18:16:10 UTC 2013
Modified Files:
src/sys/fs/filecorefs: filecore_extern.h filecore_vnops.c
Log Message:
blkoff() -> filecore_blkoff()
blksize() -> filecore_blksize()
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/fs/filecorefs/filecore_extern.h
cvs rdiff -u -r1.36 -r1.37 src/sys/fs/filecorefs/filecore_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/filecorefs/filecore_extern.h
diff -u src/sys/fs/filecorefs/filecore_extern.h:1.20 src/sys/fs/filecorefs/filecore_extern.h:1.21
--- src/sys/fs/filecorefs/filecore_extern.h:1.20 Mon May 23 22:00:30 2011
+++ src/sys/fs/filecorefs/filecore_extern.h Wed Jun 19 18:16:10 2013
@@ -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 @@ struct filecore_mnt {
#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;
Index: src/sys/fs/filecorefs/filecore_vnops.c
diff -u src/sys/fs/filecorefs/filecore_vnops.c:1.36 src/sys/fs/filecorefs/filecore_vnops.c:1.37
--- src/sys/fs/filecorefs/filecore_vnops.c:1.36 Mon Mar 18 19:35:36 2013
+++ src/sys/fs/filecorefs/filecore_vnops.c Wed Jun 19 18:16:10 2013
@@ -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 @@ filecore_read(void *v)
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);
