Module Name: src
Committed By: riastradh
Date: Sun Mar 29 14:12:28 UTC 2015
Modified Files:
src/sys/fs/nilfs: nilfs_subr.c nilfs_subr.h nilfs_vnops.c
Log Message:
Complete removal of cred argument from bread in nilfs.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/fs/nilfs/nilfs_subr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nilfs/nilfs_subr.h
cvs rdiff -u -r1.30 -r1.31 src/sys/fs/nilfs/nilfs_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/nilfs/nilfs_subr.c
diff -u src/sys/fs/nilfs/nilfs_subr.c:1.13 src/sys/fs/nilfs/nilfs_subr.c:1.14
--- src/sys/fs/nilfs/nilfs_subr.c:1.13 Sat Mar 28 19:24:05 2015
+++ src/sys/fs/nilfs/nilfs_subr.c Sun Mar 29 14:12:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_subr.c,v 1.13 2015/03/28 19:24:05 maxv Exp $ */
+/* $NetBSD: nilfs_subr.c,v 1.14 2015/03/29 14:12:28 riastradh Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.13 2015/03/28 19:24:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_subr.c,v 1.14 2015/03/29 14:12:28 riastradh Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -128,7 +128,7 @@ crc32_le(uint32_t crc, const uint8_t *bu
/* dev reading */
static int
nilfs_dev_bread(struct nilfs_device *nilfsdev, uint64_t blocknr,
- struct kauth_cred *cred, int flags, struct buf **bpp)
+ int flags, struct buf **bpp)
{
int blk2dev = nilfsdev->blocksize / DEV_BSIZE;
@@ -140,7 +140,7 @@ nilfs_dev_bread(struct nilfs_device *nil
/* read on a node */
int
nilfs_bread(struct nilfs_node *node, uint64_t blocknr,
- struct kauth_cred *cred, int flags, struct buf **bpp)
+ int flags, struct buf **bpp)
{
struct nilfs_device *nilfsdev = node->nilfsdev;
uint64_t vblocknr, pblockno;
@@ -155,7 +155,7 @@ nilfs_bread(struct nilfs_node *node, uin
error = nilfs_nvtop(node, 1, &vblocknr, &pblockno);
if (error)
return error;
- return nilfs_dev_bread(nilfsdev, pblockno, cred, flags, bpp);
+ return nilfs_dev_bread(nilfsdev, pblockno, flags, bpp);
}
return bread(node->vnode, vblocknr, node->nilfsdev->blocksize,
@@ -181,7 +181,7 @@ nilfs_get_segment_log(struct nilfs_devic
if (*bpp)
brelse(*bpp, BC_AGE);
/* read in block */
- error = nilfs_dev_bread(nilfsdev, *blocknr, NOCRED, 0, bpp);
+ error = nilfs_dev_bread(nilfsdev, *blocknr, 0, bpp);
if (error)
return error;
}
@@ -217,7 +217,7 @@ nilfs_btree_lookup_level(struct nilfs_no
return error;
/* get our block */
- error = nilfs_dev_bread(nilfsdev, btree_blknr, NOCRED, 0, &bp);
+ error = nilfs_dev_bread(nilfsdev, btree_blknr, 0, &bp);
if (error) {
return error;
}
@@ -388,7 +388,7 @@ nilfs_vtop(struct nilfs_device *nilfsdev
nilfs_mdt_trans(&nilfsdev->dat_mdt, vblocknr,
&ldatblknr, &entry_in_block);
- error = nilfs_bread(nilfsdev->dat_node, ldatblknr, NOCRED, 0, &bp);
+ error = nilfs_bread(nilfsdev->dat_node, ldatblknr, 0, &bp);
if (error) {
printf("vtop: can't read in DAT block %"PRIu64"!\n", ldatblknr);
return error;
@@ -803,7 +803,7 @@ dirhash_fill(struct nilfs_node *dir_node
blocknr = diroffset / blocksize;
blkoff = diroffset % blocksize;
- error = nilfs_bread(dir_node, blocknr, NOCRED, 0, &bp);
+ error = nilfs_bread(dir_node, blocknr, 0, &bp);
if (error) {
dirh->flags |= DIRH_BROKEN;
dirhash_purge_entries(dirh);
@@ -815,8 +815,7 @@ dirhash_fill(struct nilfs_node *dir_node
if (blkoff >= blocksize) {
blkoff = 0; blocknr++;
brelse(bp, BC_AGE);
- error = nilfs_bread(dir_node, blocknr, NOCRED, 0,
- &bp);
+ error = nilfs_bread(dir_node, blocknr, 0, &bp);
if (error) {
dirh->flags |= DIRH_BROKEN;
dirhash_purge_entries(dirh);
@@ -900,7 +899,7 @@ nilfs_lookup_name_in_dir(struct vnode *d
blocknr = diroffset / blocksize;
blkoff = diroffset % blocksize;
- error = nilfs_bread(dir_node, blocknr, NOCRED, 0, &bp);
+ error = nilfs_bread(dir_node, blocknr, 0, &bp);
if (error)
return EIO;
Index: src/sys/fs/nilfs/nilfs_subr.h
diff -u src/sys/fs/nilfs/nilfs_subr.h:1.3 src/sys/fs/nilfs/nilfs_subr.h:1.4
--- src/sys/fs/nilfs/nilfs_subr.h:1.3 Wed Oct 15 09:05:46 2014
+++ src/sys/fs/nilfs/nilfs_subr.h Sun Mar 29 14:12:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_subr.h,v 1.3 2014/10/15 09:05:46 hannken Exp $ */
+/* $NetBSD: nilfs_subr.h,v 1.4 2015/03/29 14:12:28 riastradh Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -46,7 +46,7 @@ int nilfs_get_segment_log(struct nilfs_d
void nilfs_search_super_root(struct nilfs_device *nilfsdev);
/* reading */
-int nilfs_bread(struct nilfs_node *node, uint64_t blocknr, struct kauth_cred *cred,
+int nilfs_bread(struct nilfs_node *node, uint64_t blocknr,
int flags, struct buf **bpp);
/* btree operations */
Index: src/sys/fs/nilfs/nilfs_vnops.c
diff -u src/sys/fs/nilfs/nilfs_vnops.c:1.30 src/sys/fs/nilfs/nilfs_vnops.c:1.31
--- src/sys/fs/nilfs/nilfs_vnops.c:1.30 Wed Oct 15 09:05:46 2014
+++ src/sys/fs/nilfs/nilfs_vnops.c Sun Mar 29 14:12:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.30 2014/10/15 09:05:46 hannken Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.31 2015/03/29 14:12:28 riastradh Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.30 2014/10/15 09:05:46 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.31 2015/03/29 14:12:28 riastradh Exp $");
#endif /* not lint */
@@ -555,7 +555,7 @@ nilfs_readdir(void *v)
blocknr = diroffset / blocksize;
blkoff = diroffset % blocksize;
- error = nilfs_bread(node, blocknr, NOCRED, 0, &bp);
+ error = nilfs_bread(node, blocknr, 0, &bp);
if (error)
return EIO;
while (diroffset < file_size) {
@@ -564,8 +564,7 @@ nilfs_readdir(void *v)
if (blkoff >= blocksize) {
blkoff = 0; blocknr++;
brelse(bp, BC_AGE);
- error = nilfs_bread(node, blocknr, NOCRED, 0,
- &bp);
+ error = nilfs_bread(node, blocknr, 0, &bp);
if (error)
return EIO;
}
