[src/trunk]: src/sys/fs/nilfs Complete removal of cred argument from bread in...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b7b0b65f40c4
branches:  trunk
changeset: 336988:b7b0b65f40c4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Mar 29 14:12:28 2015 +0000

description:
Complete removal of cred argument from bread in nilfs.

diffstat:

 sys/fs/nilfs/nilfs_subr.c  |  23 +++++++++++------------
 sys/fs/nilfs/nilfs_subr.h  |   4 ++--
 sys/fs/nilfs/nilfs_vnops.c |   9 ++++-----
 3 files changed, 17 insertions(+), 19 deletions(-)

diffs (155 lines):

diff -r a8a1a2f4c59b -r b7b0b65f40c4 sys/fs/nilfs/nilfs_subr.c
--- a/sys/fs/nilfs/nilfs_subr.c Sun Mar 29 13:30:43 2015 +0000
+++ b/sys/fs/nilfs/nilfs_subr.c Sun Mar 29 14:12:28 2015 +0000
@@ -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 @@
 /* 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 @@
 /* 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 @@
                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 @@
                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 @@
                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_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 @@
 
        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 @@
                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 @@
 
                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;
 
diff -r a8a1a2f4c59b -r b7b0b65f40c4 sys/fs/nilfs/nilfs_subr.h
--- a/sys/fs/nilfs/nilfs_subr.h Sun Mar 29 13:30:43 2015 +0000
+++ b/sys/fs/nilfs/nilfs_subr.h Sun Mar 29 14:12:28 2015 +0000
@@ -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 @@
 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 */
diff -r a8a1a2f4c59b -r b7b0b65f40c4 sys/fs/nilfs/nilfs_vnops.c
--- a/sys/fs/nilfs/nilfs_vnops.c        Sun Mar 29 13:30:43 2015 +0000
+++ b/sys/fs/nilfs/nilfs_vnops.c        Sun Mar 29 14:12:28 2015 +0000
@@ -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 @@
 
                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 @@
                        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;
                        }