summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/lfs/lfs.h8
-rw-r--r--sys/ufs/lfs/lfs_extern.h14
-rw-r--r--sys/ufs/lfs/lfs_segment.c10
-rw-r--r--sys/ufs/lfs/lfs_syscalls.c8
-rw-r--r--sys/ufs/lfs/lfs_vfsops.c10
5 files changed, 19 insertions, 31 deletions
diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h
index 0d2a723e6ed..5bfd6b9a681 100644
--- a/sys/ufs/lfs/lfs.h
+++ b/sys/ufs/lfs/lfs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.161 2015/03/28 19:24:05 maxv Exp $ */
+/* $NetBSD: lfs.h,v 1.162 2015/05/31 15:44:31 hannken Exp $ */
/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */
/* from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp */
@@ -929,7 +929,7 @@ struct lfs {
#define lfs_sumsize lfs_dlfs.dlfs_sumsize
#define lfs_serial lfs_dlfs.dlfs_serial
#define lfs_ibsize lfs_dlfs.dlfs_ibsize
-#define lfs_start lfs_dlfs.dlfs_start
+#define lfs_s0addr lfs_dlfs.dlfs_start
#define lfs_tstamp lfs_dlfs.dlfs_tstamp
#define lfs_inodefmt lfs_dlfs.dlfs_inodefmt
#define lfs_interleave lfs_dlfs.dlfs_interleave
@@ -1071,9 +1071,9 @@ struct lfs {
(fs)->lfs_ssize << (fs)->lfs_blktodb : \
lfs_btofsb((fs), (fs)->lfs_ssize)) * (seg))
#define lfs_dtosn(fs, daddr) /* block address to segment number */ \
- ((uint32_t)(((daddr) - (fs)->lfs_start) / lfs_segtod((fs), 1)))
+ ((uint32_t)(((daddr) - (fs)->lfs_s0addr) / lfs_segtod((fs), 1)))
#define lfs_sntod(fs, sn) /* segment number to disk address */ \
- ((daddr_t)(lfs_segtod((fs), (sn)) + (fs)->lfs_start))
+ ((daddr_t)(lfs_segtod((fs), (sn)) + (fs)->lfs_s0addr))
/*
* Structures used by lfs_bmapv and lfs_markv to communicate information
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index 99e75fd9928..64f79658f28 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_extern.h,v 1.102 2015/03/27 17:27:56 riastradh Exp $ */
+/* $NetBSD: lfs_extern.h,v 1.103 2015/05/31 15:44:31 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -223,17 +223,7 @@ int lfs_bmapv(struct proc *, fsid_t *, struct block_info *, int);
int lfs_markv(struct proc *, fsid_t *, struct block_info *, int);
/* lfs_vfsops.c */
-void lfs_init(void);
-void lfs_reinit(void);
-void lfs_done(void);
-int lfs_mountroot(void);
-int lfs_mount(struct mount *, const char *, void *, size_t *);
-int lfs_unmount(struct mount *, int);
-int lfs_statvfs(struct mount *, struct statvfs *);
-int lfs_sync(struct mount *, int, kauth_cred_t);
-int lfs_vget(struct mount *, ino_t, struct vnode **);
-int lfs_fhtovp(struct mount *, struct fid *, struct vnode **);
-int lfs_vptofh(struct vnode *, struct fid *, size_t *);
+VFS_PROTOS(lfs);
void lfs_vinit(struct mount *, struct vnode **);
int lfs_resize_fs(struct lfs *, int);
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index 8e143e831a7..73540ee52c9 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.238 2015/04/20 13:44:16 riastradh Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.239 2015/05/31 15:44:31 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.238 2015/04/20 13:44:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.239 2015/05/31 15:44:31 hannken Exp $");
#define _VFS_VNODE_PRIVATE /* XXX: check for VI_MARKER, this has to go */
@@ -1784,11 +1784,11 @@ lfs_initseg(struct lfs *fs)
brelse(bp, 0);
/* Segment zero could also contain the labelpad */
if (fs->lfs_version > 1 && sp->seg_number == 0 &&
- fs->lfs_start < lfs_btofsb(fs, LFS_LABELPAD)) {
+ fs->lfs_s0addr < lfs_btofsb(fs, LFS_LABELPAD)) {
fs->lfs_offset +=
- lfs_btofsb(fs, LFS_LABELPAD) - fs->lfs_start;
+ lfs_btofsb(fs, LFS_LABELPAD) - fs->lfs_s0addr;
sp->seg_bytes_left -=
- LFS_LABELPAD - lfs_fsbtob(fs, fs->lfs_start);
+ LFS_LABELPAD - lfs_fsbtob(fs, fs->lfs_s0addr);
}
} else {
sp->seg_number = lfs_dtosn(fs, fs->lfs_curseg);
diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c
index a8a21a8254e..cfcafa35176 100644
--- a/sys/ufs/lfs/lfs_syscalls.c
+++ b/sys/ufs/lfs/lfs_syscalls.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_syscalls.c,v 1.157 2015/04/20 13:44:16 riastradh Exp $ */
+/* $NetBSD: lfs_syscalls.c,v 1.158 2015/05/31 15:44:31 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007, 2008
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.157 2015/04/20 13:44:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.158 2015/05/31 15:44:31 hannken Exp $");
#ifndef LFS
# define LFS /* for prototypes in syscallargs.h */
@@ -937,8 +937,8 @@ lfs_do_segclean(struct lfs *fs, unsigned long segnum)
if (sup->su_flags & SEGUSE_SUPERBLOCK)
fs->lfs_avail -= lfs_btofsb(fs, LFS_SBPAD);
if (fs->lfs_version > 1 && segnum == 0 &&
- fs->lfs_start < lfs_btofsb(fs, LFS_LABELPAD))
- fs->lfs_avail -= lfs_btofsb(fs, LFS_LABELPAD) - fs->lfs_start;
+ fs->lfs_s0addr < lfs_btofsb(fs, LFS_LABELPAD))
+ fs->lfs_avail -= lfs_btofsb(fs, LFS_LABELPAD) - fs->lfs_s0addr;
mutex_enter(&lfs_lock);
fs->lfs_bfree += sup->su_nsums * lfs_btofsb(fs, fs->lfs_sumsize) +
lfs_btofsb(fs, sup->su_ninos * fs->lfs_ibsize);
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 695ae294c7a..0974b926b78 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.322 2015/03/28 19:24:05 maxv Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.323 2015/05/31 15:44:31 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.322 2015/03/28 19:24:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.323 2015/05/31 15:44:31 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -119,8 +119,6 @@ MODULE(MODULE_CLASS_VFS, lfs, NULL);
static int lfs_gop_write(struct vnode *, struct vm_page **, int, int);
static int lfs_mountfs(struct vnode *, struct mount *, struct lwp *);
-static int lfs_extattrctl(struct mount *, int, struct vnode *, int,
- const char *);
static struct sysctllog *lfs_sysctl_log;
@@ -953,7 +951,7 @@ lfs_mountfs(struct vnode *devvp, struct mount *mp, struct lwp *l)
if (fs->lfs_version < 2) {
fs->lfs_sumsize = LFS_V1_SUMMARY_SIZE;
fs->lfs_ibsize = fs->lfs_bsize;
- fs->lfs_start = fs->lfs_sboffs[0];
+ fs->lfs_s0addr = fs->lfs_sboffs[0];
fs->lfs_tstamp = fs->lfs_otstamp;
fs->lfs_fsbtodb = 0;
}
@@ -2321,7 +2319,7 @@ lfs_resize_fs(struct lfs *fs, int newnsegs)
/*
* Extended attribute dispatch
*/
-static int
+int
lfs_extattrctl(struct mount *mp, int cmd, struct vnode *vp,
int attrnamespace, const char *attrname)
{