Deleted Added
full compact
ext2_mount.h (139778) ext2_mount.h (202283)
1/*-
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)ufsmount.h 8.6 (Berkeley) 3/30/95
1/*-
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)ufsmount.h 8.6 (Berkeley) 3/30/95
30 * $FreeBSD: head/sys/gnu/fs/ext2fs/ext2_mount.h 139778 2005-01-06 18:27:30Z imp $
30 * $FreeBSD: head/sys/fs/ext2fs/ext2_mount.h 202283 2010-01-14 14:30:54Z lulf $
31 */
32
31 */
32
33#ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
34#define _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
33#ifndef _FS_EXT2FS_EXT2_MOUNT_H_
34#define _FS_EXT2FS_EXT2_MOUNT_H_
35
36#ifdef _KERNEL
37
38#ifdef MALLOC_DECLARE
39MALLOC_DECLARE(M_EXT2NODE);
40#endif
41
42struct vnode;
43
44/* This structure describes the ext2fs specific mount structure data. */
45struct ext2mount {
46 struct mount *um_mountp; /* filesystem vfs structure */
47 struct cdev *um_dev; /* device mounted */
48 struct vnode *um_devvp; /* block device mounted vnode */
49
35
36#ifdef _KERNEL
37
38#ifdef MALLOC_DECLARE
39MALLOC_DECLARE(M_EXT2NODE);
40#endif
41
42struct vnode;
43
44/* This structure describes the ext2fs specific mount structure data. */
45struct ext2mount {
46 struct mount *um_mountp; /* filesystem vfs structure */
47 struct cdev *um_dev; /* device mounted */
48 struct vnode *um_devvp; /* block device mounted vnode */
49
50 struct ext2_sb_info *um_e2fs; /* EXT2FS */
51#define em_e2fsb um_e2fs->s_es
50 struct m_ext2fs *um_e2fs; /* EXT2FS */
51#define em_e2fsb um_e2fs->e2fs
52
53 u_long um_nindir; /* indirect ptrs per block */
54 u_long um_bptrtodb; /* indir ptr to disk block */
55 u_long um_seqinc; /* inc between seq blocks */
56
52
53 u_long um_nindir; /* indirect ptrs per block */
54 u_long um_bptrtodb; /* indir ptr to disk block */
55 u_long um_seqinc; /* inc between seq blocks */
56
57 struct mtx um_lock; /* Protects ext2mount & fs */
58
57 struct g_consumer *um_cp;
58 struct bufobj *um_bo;
59};
60
59 struct g_consumer *um_cp;
60 struct bufobj *um_bo;
61};
62
63#define EXT2_LOCK(aa) mtx_lock(&(aa)->um_lock)
64#define EXT2_UNLOCK(aa) mtx_unlock(&(aa)->um_lock)
65#define EXT2_MTX(aa) (&(aa)->um_lock)
66
61/* Convert mount ptr to ext2fsmount ptr. */
62#define VFSTOEXT2(mp) ((struct ext2mount *)((mp)->mnt_data))
63
64/*
65 * Macros to access file system parameters in the ufsmount structure.
66 * Used by ufs_bmap.
67 */
68#define MNINDIR(ump) ((ump)->um_nindir)
69#define blkptrtodb(ump, b) ((b) << (ump)->um_bptrtodb)
70#define is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
71#endif /* _KERNEL */
72
73#endif
67/* Convert mount ptr to ext2fsmount ptr. */
68#define VFSTOEXT2(mp) ((struct ext2mount *)((mp)->mnt_data))
69
70/*
71 * Macros to access file system parameters in the ufsmount structure.
72 * Used by ufs_bmap.
73 */
74#define MNINDIR(ump) ((ump)->um_nindir)
75#define blkptrtodb(ump, b) ((b) << (ump)->um_bptrtodb)
76#define is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
77#endif /* _KERNEL */
78
79#endif