CVS commit: src/sys/kern

[Maxime Villard]

Module Name:    src
Committed By:   maxv
Date:           Sat Mar 28 16:55:21 UTC 2015

Modified Files:
        src/sys/kern: vfs_bio.c

Log Message:
Remove the 'cred' argument from bio_doread().


To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/sys/kern/vfs_bio.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/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.252 src/sys/kern/vfs_bio.c:1.253
--- src/sys/kern/vfs_bio.c:1.252	Mon Sep  8 22:01:24 2014
+++ src/sys/kern/vfs_bio.c	Sat Mar 28 16:55:21 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_bio.c,v 1.252 2014/09/08 22:01:24 joerg Exp $	*/
+/*	$NetBSD: vfs_bio.c,v 1.253 2015/03/28 16:55:21 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.252 2014/09/08 22:01:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.253 2015/03/28 16:55:21 maxv Exp $");
 
 #include "opt_bufcache.h"
 
@@ -172,8 +172,7 @@ static void buf_setwm(void);
 static int buf_trim(void);
 static void *bufpool_page_alloc(struct pool *, int);
 static void bufpool_page_free(struct pool *, void *);
-static buf_t *bio_doread(struct vnode *, daddr_t, int,
-    kauth_cred_t, int);
+static buf_t *bio_doread(struct vnode *, daddr_t, int, int);
 static buf_t *getnewbuf(int, int, int);
 static int buf_lotsfree(void);
 static int buf_canrelease(void);
@@ -659,8 +658,7 @@ buf_mrelease(void *addr, size_t size)
  * bread()/breadn() helper.
  */
 static buf_t *
-bio_doread(struct vnode *vp, daddr_t blkno, int size, kauth_cred_t cred,
-    int async)
+bio_doread(struct vnode *vp, daddr_t blkno, int size, int async)
 {
 	buf_t *bp;
 	struct mount *mp;
@@ -726,7 +724,7 @@ bread(struct vnode *vp, daddr_t blkno, i
 	int error;
 
 	/* Get buffer for block. */
-	bp = *bpp = bio_doread(vp, blkno, size, cred, 0);
+	bp = *bpp = bio_doread(vp, blkno, size, 0);
 	if (bp == NULL)
 		return ENOMEM;
 
@@ -753,7 +751,7 @@ breadn(struct vnode *vp, daddr_t blkno, 
 	buf_t *bp;
 	int error, i;
 
-	bp = *bpp = bio_doread(vp, blkno, size, cred, 0);
+	bp = *bpp = bio_doread(vp, blkno, size, 0);
 	if (bp == NULL)
 		return ENOMEM;
 
@@ -768,7 +766,7 @@ breadn(struct vnode *vp, daddr_t blkno, 
 
 		/* Get a buffer for the read-ahead block */
 		mutex_exit(&bufcache_lock);
-		(void) bio_doread(vp, rablks[i], rasizes[i], cred, B_ASYNC);
+		(void) bio_doread(vp, rablks[i], rasizes[i], B_ASYNC);
 		mutex_enter(&bufcache_lock);
 	}
 	mutex_exit(&bufcache_lock);