White-space align a struct definition.
Move a SYSINIT to the file where it belongs.
This commit is contained in:
parent
900024a6aa
commit
758f11d127
@ -146,37 +146,37 @@ MALLOC_DECLARE(M_DEVFS);
|
||||
#endif
|
||||
|
||||
struct devfs_dirent {
|
||||
int de_inode;
|
||||
int de_flags;
|
||||
int de_inode;
|
||||
int de_flags;
|
||||
#define DE_WHITEOUT 0x1
|
||||
#define DE_DOT 0x2
|
||||
#define DE_DOTDOT 0x4
|
||||
struct dirent *de_dirent;
|
||||
struct dirent *de_dirent;
|
||||
TAILQ_ENTRY(devfs_dirent) de_list;
|
||||
TAILQ_HEAD(, devfs_dirent) de_dlist;
|
||||
struct devfs_dirent *de_dir;
|
||||
int de_links;
|
||||
mode_t de_mode;
|
||||
uid_t de_uid;
|
||||
gid_t de_gid;
|
||||
struct label *de_label;
|
||||
struct timespec de_atime;
|
||||
struct timespec de_mtime;
|
||||
struct timespec de_ctime;
|
||||
struct vnode *de_vnode;
|
||||
char * de_symlink;
|
||||
struct devfs_dirent *de_dir;
|
||||
int de_links;
|
||||
mode_t de_mode;
|
||||
uid_t de_uid;
|
||||
gid_t de_gid;
|
||||
struct label *de_label;
|
||||
struct timespec de_atime;
|
||||
struct timespec de_mtime;
|
||||
struct timespec de_ctime;
|
||||
struct vnode *de_vnode;
|
||||
char *de_symlink;
|
||||
};
|
||||
|
||||
struct devfs_mount {
|
||||
struct mount *dm_mount;
|
||||
struct devfs_dirent *dm_rootdir;
|
||||
struct devfs_dirent *dm_basedir;
|
||||
unsigned dm_generation;
|
||||
struct devfs_dirent **dm_dirent;
|
||||
struct devfs_dirent **dm_overflow;
|
||||
int dm_inode;
|
||||
struct lock dm_lock;
|
||||
devfs_rsnum dm_ruleset;
|
||||
struct mount *dm_mount;
|
||||
struct devfs_dirent *dm_rootdir;
|
||||
struct devfs_dirent *dm_basedir;
|
||||
unsigned dm_generation;
|
||||
struct devfs_dirent **dm_dirent;
|
||||
struct devfs_dirent **dm_overflow;
|
||||
int dm_inode;
|
||||
struct lock dm_lock;
|
||||
devfs_rsnum dm_ruleset;
|
||||
};
|
||||
|
||||
/*
|
||||
@ -187,7 +187,6 @@ struct devfs_mount {
|
||||
#define VFSTODEVFS(mp) ((struct devfs_mount *)((mp)->mnt_data))
|
||||
|
||||
void devfs_rules_apply(struct devfs_mount *dm, struct devfs_dirent *de);
|
||||
void devfs_rules_init(void);
|
||||
int devfs_rules_ioctl(struct mount *mp, u_long cmd, caddr_t data, struct thread *td);
|
||||
void devfs_rules_newmount(struct devfs_mount *dm, struct thread *td);
|
||||
int devfs_allocv (struct devfs_dirent *de, struct mount *mp, struct vnode **vpp, struct thread *td);
|
||||
|
@ -1,4 +1,3 @@
|
||||
#define DEBUG 1
|
||||
/*
|
||||
* Copyright (c) 2000
|
||||
* Poul-Henning Kamp. All rights reserved.
|
||||
@ -443,13 +442,3 @@ devfs_destroy(dev_t dev)
|
||||
atomic_cmpset_int(&devfs_nextino, i, ino);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
devfs_init(void *junk)
|
||||
{
|
||||
|
||||
devfs_rules_init();
|
||||
}
|
||||
|
||||
SYSINIT(devfs, SI_SUB_DEVFS, SI_ORDER_FIRST, devfs_init, NULL);
|
||||
|
||||
|
@ -146,8 +146,8 @@ devfs_rules_apply(struct devfs_mount *dm, struct devfs_dirent *de)
|
||||
/*
|
||||
* Rule subsystem SYSINIT hook.
|
||||
*/
|
||||
void
|
||||
devfs_rules_init(void)
|
||||
static void
|
||||
devfs_rules_init(void *junk __unused)
|
||||
{
|
||||
struct devfs_ruleset *ds;
|
||||
|
||||
@ -158,6 +158,8 @@ devfs_rules_init(void)
|
||||
ds->ds_refcount = 1; /* Prevent reaping. */
|
||||
}
|
||||
|
||||
SYSINIT(devfs_rules, SI_SUB_DEVFS, SI_ORDER_FIRST, devfs_rules_init, NULL);
|
||||
|
||||
/*
|
||||
* Rule subsystem ioctl hook.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user