Module Name: src
Committed By: maxv
Date: Sat Mar 28 17:23:43 UTC 2015
Modified Files:
src/share/man/man9: buffercache.9
src/sys/fs/cd9660: cd9660_vnops.c
src/sys/kern: vfs_bio.c
src/sys/sys: buf.h
src/sys/ufs/chfs: chfs_vnops.c
src/sys/ufs/ext2fs: ext2fs_readwrite.c
src/sys/ufs/ffs: ffs_snapshot.c
src/sys/ufs/lfs: ulfs_lookup.c ulfs_readwrite.c
src/sys/ufs/ufs: ufs_lookup.c ufs_readwrite.c
Log Message:
Remove the 'cred' argument from breadn(), and update the man page
accordingly.
ok hannken@
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/share/man/man9/buffercache.9
cvs rdiff -u -r1.49 -r1.50 src/sys/fs/cd9660/cd9660_vnops.c
cvs rdiff -u -r1.253 -r1.254 src/sys/kern/vfs_bio.c
cvs rdiff -u -r1.119 -r1.120 src/sys/sys/buf.h
cvs rdiff -u -r1.25 -r1.26 src/sys/ufs/chfs/chfs_vnops.c
cvs rdiff -u -r1.71 -r1.72 src/sys/ufs/ext2fs/ext2fs_readwrite.c
cvs rdiff -u -r1.137 -r1.138 src/sys/ufs/ffs/ffs_snapshot.c
cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/lfs/ulfs_lookup.c
cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/lfs/ulfs_readwrite.c
cvs rdiff -u -r1.133 -r1.134 src/sys/ufs/ufs/ufs_lookup.c
cvs rdiff -u -r1.112 -r1.113 src/sys/ufs/ufs/ufs_readwrite.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/buffercache.9
diff -u src/share/man/man9/buffercache.9:1.25 src/share/man/man9/buffercache.9:1.26
--- src/share/man/man9/buffercache.9:1.25 Thu Dec 2 12:54:13 2010
+++ src/share/man/man9/buffercache.9 Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: buffercache.9,v 1.25 2010/12/02 12:54:13 wiz Exp $
+.\" $NetBSD: buffercache.9,v 1.26 2015/03/28 17:23:42 maxv Exp $
.\"
.\" Copyright (c)2003 YAMAMOTO Takashi,
.\" All rights reserved.
@@ -101,7 +101,7 @@
.\"
.\"
.\" ------------------------------------------------------------
-.Dd November 11, 2009
+.Dd March 28, 2015
.Dt BUFFERCACHE 9
.Os
.Sh NAME
@@ -128,7 +128,7 @@
.Ft int
.Fn breadn "struct vnode *vp" "daddr_t blkno" "int size" \
"daddr_t rablks[]" "int rasizes[]" "int nrablks" \
-"struct kauth_cred *cred" "int flags" "buf_t **bpp"
+"int flags" "buf_t **bpp"
.Ft int
.Fn bwrite "buf_t *bp"
.Ft void
@@ -220,7 +220,7 @@ it should be unbusied using one of varia
Otherwise, it should be unbusied using
.Fn brelse .
.\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-.It Fn breadn "vp" "blkno" "size" "rablks" "rasizes" "nrablks" "cred" "flags" \
+.It Fn breadn "vp" "blkno" "size" "rablks" "rasizes" "nrablks" "flags" \
"bpp"
Get a buffer as
.Fn bread .
Index: src/sys/fs/cd9660/cd9660_vnops.c
diff -u src/sys/fs/cd9660/cd9660_vnops.c:1.49 src/sys/fs/cd9660/cd9660_vnops.c:1.50
--- src/sys/fs/cd9660/cd9660_vnops.c:1.49 Fri Jul 25 08:20:51 2014
+++ src/sys/fs/cd9660/cd9660_vnops.c Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vnops.c,v 1.49 2014/07/25 08:20:51 dholland Exp $ */
+/* $NetBSD: cd9660_vnops.c,v 1.50 2015/03/28 17:23:42 maxv Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.49 2014/07/25 08:20:51 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.50 2015/03/28 17:23:42 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -262,7 +262,7 @@ cd9660_read(void *v)
if (cd9660_lblktosize(imp, rablock) < ip->i_size) {
rasize = cd9660_blksize(imp, ip, rablock);
error = breadn(vp, lbn, size, &rablock,
- &rasize, 1, NOCRED, 0, &bp);
+ &rasize, 1, 0, &bp);
} else {
error = bread(vp, lbn, size, NOCRED, 0, &bp);
}
Index: src/sys/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.253 src/sys/kern/vfs_bio.c:1.254
--- src/sys/kern/vfs_bio.c:1.253 Sat Mar 28 16:55:21 2015
+++ src/sys/kern/vfs_bio.c Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.253 2015/03/28 16:55:21 maxv Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.254 2015/03/28 17:23:42 maxv Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.253 2015/03/28 16:55:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.254 2015/03/28 17:23:42 maxv Exp $");
#include "opt_bufcache.h"
@@ -746,7 +746,7 @@ bread(struct vnode *vp, daddr_t blkno, i
*/
int
breadn(struct vnode *vp, daddr_t blkno, int size, daddr_t *rablks,
- int *rasizes, int nrablks, kauth_cred_t cred, int flags, buf_t **bpp)
+ int *rasizes, int nrablks, int flags, buf_t **bpp)
{
buf_t *bp;
int error, i;
Index: src/sys/sys/buf.h
diff -u src/sys/sys/buf.h:1.119 src/sys/sys/buf.h:1.120
--- src/sys/sys/buf.h:1.119 Fri Feb 17 08:45:11 2012
+++ src/sys/sys/buf.h Sat Mar 28 17:23:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.119 2012/02/17 08:45:11 yamt Exp $ */
+/* $NetBSD: buf.h,v 1.120 2015/03/28 17:23:43 maxv Exp $ */
/*-
* Copyright (c) 1999, 2000, 2007, 2008 The NetBSD Foundation, Inc.
@@ -269,7 +269,7 @@ void biodone(buf_t *);
int biowait(buf_t *);
int bread(struct vnode *, daddr_t, int, struct kauth_cred *, int, buf_t **);
int breadn(struct vnode *, daddr_t, int, daddr_t *, int *, int,
- struct kauth_cred *, int, buf_t **);
+ int, buf_t **);
void brelsel(buf_t *, int);
void brelse(buf_t *, int);
void bremfree(buf_t *);
Index: src/sys/ufs/chfs/chfs_vnops.c
diff -u src/sys/ufs/chfs/chfs_vnops.c:1.25 src/sys/ufs/chfs/chfs_vnops.c:1.26
--- src/sys/ufs/chfs/chfs_vnops.c:1.25 Fri Mar 27 17:27:55 2015
+++ src/sys/ufs/chfs/chfs_vnops.c Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vnops.c,v 1.25 2015/03/27 17:27:55 riastradh Exp $ */
+/* $NetBSD: chfs_vnops.c,v 1.26 2015/03/28 17:23:42 maxv Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -700,7 +700,7 @@ chfs_read(void *v)
int nextsize = chfs_blksize(chmp, ip, nextlbn);
dbg("size: %ld\n", size);
error = breadn(vp, lbn,
- size, &nextlbn, &nextsize, 1, NOCRED, 0, &bp);
+ size, &nextlbn, &nextsize, 1, 0, &bp);
dbg("after breadN\n");
}
if (error)
Index: src/sys/ufs/ext2fs/ext2fs_readwrite.c
diff -u src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.71 src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.72
--- src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.71 Sat Mar 28 17:06:15 2015
+++ src/sys/ufs/ext2fs/ext2fs_readwrite.c Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_readwrite.c,v 1.71 2015/03/28 17:06:15 riastradh Exp $ */
+/* $NetBSD: ext2fs_readwrite.c,v 1.72 2015/03/28 17:23:42 maxv Exp $ */
/*-
* Copyright (c) 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.71 2015/03/28 17:06:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.72 2015/03/28 17:23:42 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -200,7 +200,7 @@ ext2fs_bufrd(struct vnode *vp, struct ui
else {
int nextsize = fs->e2fs_bsize;
error = breadn(vp, lbn,
- size, &nextlbn, &nextsize, 1, NOCRED, 0, &bp);
+ size, &nextlbn, &nextsize, 1, 0, &bp);
}
if (error)
break;
Index: src/sys/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.137 src/sys/ufs/ffs/ffs_snapshot.c:1.138
--- src/sys/ufs/ffs/ffs_snapshot.c:1.137 Fri Sep 5 06:10:07 2014
+++ src/sys/ufs/ffs/ffs_snapshot.c Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.137 2014/09/05 06:10:07 matt Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.138 2015/03/28 17:23:42 maxv Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.137 2014/09/05 06:10:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.138 2015/03/28 17:23:42 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -2098,7 +2098,7 @@ ffs_snapshot_read(struct vnode *vp, stru
} else {
int nextsize = fs->fs_bsize;
error = breadn(vp, lbn,
- size, &nextlbn, &nextsize, 1, NOCRED, 0, &bp);
+ size, &nextlbn, &nextsize, 1, 0, &bp);
}
if (error)
break;
Index: src/sys/ufs/lfs/ulfs_lookup.c
diff -u src/sys/ufs/lfs/ulfs_lookup.c:1.22 src/sys/ufs/lfs/ulfs_lookup.c:1.23
--- src/sys/ufs/lfs/ulfs_lookup.c:1.22 Fri Mar 27 17:27:56 2015
+++ src/sys/ufs/lfs/ulfs_lookup.c Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_lookup.c,v 1.22 2015/03/27 17:27:56 riastradh Exp $ */
+/* $NetBSD: ulfs_lookup.c,v 1.23 2015/03/28 17:23:42 maxv Exp $ */
/* from NetBSD: ufs_lookup.c,v 1.122 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.22 2015/03/27 17:27:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.23 2015/03/28 17:23:42 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_lfs.h"
@@ -1313,7 +1313,7 @@ ulfs_blkatoff(struct vnode *vp, off_t of
}
KASSERT(run >= 1);
error = breadn(vp, blks[0], blksizes[0], &blks[1], &blksizes[1],
- run - 1, NOCRED, (modify ? B_MODIFY : 0), &bp);
+ run - 1, (modify ? B_MODIFY : 0), &bp);
if (error != 0) {
*bpp = NULL;
goto out;
Index: src/sys/ufs/lfs/ulfs_readwrite.c
diff -u src/sys/ufs/lfs/ulfs_readwrite.c:1.12 src/sys/ufs/lfs/ulfs_readwrite.c:1.13
--- src/sys/ufs/lfs/ulfs_readwrite.c:1.12 Sat Mar 28 17:08:53 2015
+++ src/sys/ufs/lfs/ulfs_readwrite.c Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_readwrite.c,v 1.12 2015/03/28 17:08:53 riastradh Exp $ */
+/* $NetBSD: ulfs_readwrite.c,v 1.13 2015/03/28 17:23:42 maxv Exp $ */
/* from NetBSD: ufs_readwrite.c,v 1.105 2013/01/22 09:39:18 dholland Exp */
/*-
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.12 2015/03/28 17:08:53 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.13 2015/03/28 17:23:42 maxv Exp $");
#ifdef LFS_READWRITE
#define FS struct lfs
@@ -194,7 +194,7 @@ BUFRD(struct vnode *vp, struct uio *uio,
else {
int nextsize = lfs_blksize(fs, ip, nextlbn);
error = breadn(vp, lbn,
- size, &nextlbn, &nextsize, 1, NOCRED, 0, &bp);
+ size, &nextlbn, &nextsize, 1, 0, &bp);
}
if (error)
break;
Index: src/sys/ufs/ufs/ufs_lookup.c
diff -u src/sys/ufs/ufs/ufs_lookup.c:1.133 src/sys/ufs/ufs/ufs_lookup.c:1.134
--- src/sys/ufs/ufs/ufs_lookup.c:1.133 Fri Mar 27 17:27:56 2015
+++ src/sys/ufs/ufs/ufs_lookup.c Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_lookup.c,v 1.133 2015/03/27 17:27:56 riastradh Exp $ */
+/* $NetBSD: ufs_lookup.c,v 1.134 2015/03/28 17:23:42 maxv Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.133 2015/03/27 17:27:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.134 2015/03/28 17:23:42 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ffs.h"
@@ -1279,7 +1279,7 @@ ufs_blkatoff(struct vnode *vp, off_t off
}
KASSERT(run >= 1);
error = breadn(vp, blks[0], blksizes[0], &blks[1], &blksizes[1],
- run - 1, NOCRED, (modify ? B_MODIFY : 0), &bp);
+ run - 1, (modify ? B_MODIFY : 0), &bp);
if (error != 0) {
*bpp = NULL;
goto out;
Index: src/sys/ufs/ufs/ufs_readwrite.c
diff -u src/sys/ufs/ufs/ufs_readwrite.c:1.112 src/sys/ufs/ufs/ufs_readwrite.c:1.113
--- src/sys/ufs/ufs/ufs_readwrite.c:1.112 Sat Mar 28 17:06:15 2015
+++ src/sys/ufs/ufs/ufs_readwrite.c Sat Mar 28 17:23:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_readwrite.c,v 1.112 2015/03/28 17:06:15 riastradh Exp $ */
+/* $NetBSD: ufs_readwrite.c,v 1.113 2015/03/28 17:23:42 maxv Exp $ */
/*-
* Copyright (c) 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.112 2015/03/28 17:06:15 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.113 2015/03/28 17:23:42 maxv Exp $");
#ifdef LFS_READWRITE
#define FS struct lfs
@@ -205,7 +205,7 @@ BUFRD(struct vnode *vp, struct uio *uio,
else {
int nextsize = ufs_blksize(fs, ip, nextlbn);
error = breadn(vp, lbn,
- size, &nextlbn, &nextsize, 1, NOCRED, 0, &bp);
+ size, &nextlbn, &nextsize, 1, 0, &bp);
}
if (error)
break;
