Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/fs/tmpfs/tmpfs.h,v rcsdiff: /ftp/cvs/cvsroot/src/sys/fs/tmpfs/tmpfs.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.37 retrieving revision 1.37.16.3 diff -u -p -r1.37 -r1.37.16.3 --- src/sys/fs/tmpfs/tmpfs.h 2008/07/29 09:10:09 1.37 +++ src/sys/fs/tmpfs/tmpfs.h 2011/05/31 03:04:59 1.37.16.3 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs.h,v 1.37 2008/07/29 09:10:09 pooka Exp $ */ +/* $NetBSD: tmpfs.h,v 1.37.16.3 2011/05/31 03:04:59 rmind Exp $ */ /* * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -33,110 +33,58 @@ #ifndef _FS_TMPFS_TMPFS_H_ #define _FS_TMPFS_TMPFS_H_ +#if !defined(_KERNEL) && !defined(_KMEMUSER) +#error "not supposed to be exposed to userland" +#endif + #include #include +#include #include #include -/* --------------------------------------------------------------------- */ -/* For the kernel and anyone who likes peeking into kernel memory */ -/* --------------------------------------------------------------------- */ - -#if defined(_KERNEL) -#include -#endif /* defined(_KERNEL) */ - -/* --------------------------------------------------------------------- */ - /* * Internal representation of a tmpfs directory entry. + * + * All fields are protected by vnode lock. */ -struct tmpfs_dirent { +typedef struct tmpfs_dirent { TAILQ_ENTRY(tmpfs_dirent) td_entries; - /* Length of the name stored in this directory entry. This avoids - * the need to recalculate it every time the name is used. */ - uint16_t td_namelen; + /* Pointer to the inode this entry refers to. */ + struct tmpfs_node * td_node; - /* The name of the entry, allocated from a string pool. This - * string is not required to be zero-terminated; therefore, the - * td_namelen field must always be used when accessing its value. */ + /* Name and its length. */ char * td_name; + uint16_t td_namelen; +} tmpfs_dirent_t; - /* Pointer to the node this entry refers to. */ - struct tmpfs_node * td_node; -}; - -/* A directory in tmpfs holds a sorted list of directory entries, which in - * turn point to other files (which can be directories themselves). - * - * In tmpfs, this list is managed by a tail queue, whose head is defined by - * the struct tmpfs_dir type. - * - * It is imporant to notice that directories do not have entries for . and - * .. as other file systems do. These can be generated when requested - * based on information available by other means, such as the pointer to - * the node itself in the former case or the pointer to the parent directory - * in the latter case. This is done to simplify tmpfs's code and, more - * importantly, to remove redundancy. */ TAILQ_HEAD(tmpfs_dir, tmpfs_dirent); -/* Each entry in a directory has a cookie that identifies it. Cookies - * supersede offsets within directories because, given how tmpfs stores - * directories in memory, there is no such thing as an offset. (Emulating - * a real offset could be very difficult.) - * - * The '.', '..' and the end of directory markers have fixed cookies which - * cannot collide with the cookies generated by other entries. The cookies - * fot the other entries are generated based on the memory address on which - * stores their information is stored. - * - * Ideally, using the entry's memory pointer as the cookie would be enough - * to represent it and it wouldn't cause collisions in any system. - * Unfortunately, this results in "offsets" with very large values which - * later raise problems in the Linux compatibility layer (and maybe in other - * places) as described in PR kern/32034. Hence we need to workaround this - * with a rather ugly hack. - * - * Linux 32-bit binaries, unless built with _FILE_OFFSET_BITS=64, have off_t - * set to 'long', which is a 32-bit *signed* long integer. Regardless of - * the macro value, GLIBC (2.3 at least) always uses the getdents64 - * system call (when calling readdir) which internally returns off64_t - * offsets. In order to make 32-bit binaries work, *GLIBC* converts the - * 64-bit values returned by the kernel to 32-bit ones and aborts with - * EOVERFLOW if the conversion results in values that won't fit in 32-bit - * integers (which it assumes is because the directory is extremely large). - * This wouldn't cause problems if we were dealing with unsigned integers, - * but as we have signed integers, this check fails due to sign expansion. - * - * For example, consider that the kernel returns the 0xc1234567 cookie to - * userspace in a off64_t integer. Later on, GLIBC casts this value to - * off_t (remember, signed) with code similar to: - * system call returns the offset in kernel_value; - * off_t casted_value = kernel_value; - * if (sizeof(off_t) != sizeof(off64_t) && - * kernel_value != casted_value) - * error! - * In this case, casted_value still has 0xc1234567, but when it is compared - * for equality against kernel_value, it is promoted to a 64-bit integer and - * becomes 0xffffffffc1234567, which is different than 0x00000000c1234567. - * Then, GLIBC assumes this is because the directory is very large. - * - * Given that all the above happens in user-space, we have no control over - * it; therefore we must workaround the issue here. We do this by - * truncating the pointer value to a 32-bit integer and hope that there - * won't be collisions. In fact, this will not cause any problems in - * 32-bit platforms but some might arise in 64-bit machines (I'm not sure - * if they can happen at all in practice). - * - * XXX A nicer solution shall be attempted. */ #if defined(_KERNEL) + +/* Validate maximum td_namelen length. */ +CTASSERT(MAXNAMLEN < UINT16_MAX); + #define TMPFS_DIRCOOKIE_DOT 0 #define TMPFS_DIRCOOKIE_DOTDOT 1 #define TMPFS_DIRCOOKIE_EOF 2 -static __inline -off_t -tmpfs_dircookie(struct tmpfs_dirent *de) + +/* + * Each entry in a directory has a cookie that identifies it. Cookies + * supersede offsets within directories, as tmpfs has no offsets as such. + * + * The '.', '..' and the end of directory markers have fixed cookies, + * which cannot collide with the cookies generated by other entries. + * + * The cookies for the other entries are generated based on the memory + * address of their representative meta-data structure. + * + * XXX: Truncating directory cookies to 31 bits now - workaround for + * problem with Linux compat, see PR/32034. + */ +static inline off_t +tmpfs_dircookie(tmpfs_dirent_t *de) { off_t cookie; @@ -147,43 +95,49 @@ tmpfs_dircookie(struct tmpfs_dirent *de) return cookie; } -#endif /* defined(_KERNEL) */ - -/* --------------------------------------------------------------------- */ +#endif /* - * Internal representation of a tmpfs file system node. + * Internal representation of a tmpfs file system node -- inode. * * This structure is splitted in two parts: one holds attributes common * to all file types and the other holds data that is only applicable to - * a particular type. The code must be careful to only access those - * attributes that are actually allowed by the node's type. + * a particular type. + * + * All fields are protected by vnode lock. The vnode association itself + * is protected by tmpfs_node_t::tn_vlock. */ -struct tmpfs_node { - /* Doubly-linked list entry which links all existing nodes for a - * single file system. This is provided to ease the removal of - * all nodes during the unmount operation. */ +typedef struct tmpfs_node { LIST_ENTRY(tmpfs_node) tn_entries; - /* The node's type. Any of 'VBLK', 'VCHR', 'VDIR', 'VFIFO', - * 'VLNK', 'VREG' and 'VSOCK' is allowed. The usage of vnode - * types instead of a custom enumeration is to make things simpler - * and faster, as we do not need to convert between two types. */ + /* + * Each inode has a corresponding vnode. It is a bi-directional + * association. Whenever vnode is allocated, its v_data field is + * set to the inode it reference, and tmpfs_node_t::tn_vnode is + * set to point to the said vnode. + * + * Further attempts to allocate a vnode for this same node will + * result in returning a new reference to the value stored in + * tn_vnode. It may be NULL when the node is unused (that is, + * no vnode has been allocated or it has been reclaimed). + */ + kmutex_t tn_vlock; + vnode_t * tn_vnode; + + /* Directory entry. Only a hint, since hard link can have multiple. */ + tmpfs_dirent_t * tn_dirent_hint; + + /* The inode type: VBLK, VCHR, VDIR, VFIFO, VLNK, VREG or VSOCK. */ enum vtype tn_type; - /* Node identifier. */ + /* Inode identifier and generation number. */ ino_t tn_id; + unsigned long tn_gen; - /* Node's internal status. This is used by several file system - * operations to do modifications to the node in a delayed - * fashion. */ + /* Inode status flags (for operations in delayed manner). */ int tn_status; -#define TMPFS_NODE_ACCESSED (1 << 1) -#define TMPFS_NODE_MODIFIED (1 << 2) -#define TMPFS_NODE_CHANGED (1 << 3) - /* The node size. It does not necessarily match the real amount - * of memory consumed by it. */ + /* The inode size. */ off_t tn_size; /* Generic node attributes. */ @@ -196,205 +150,171 @@ struct tmpfs_node { struct timespec tn_mtime; struct timespec tn_ctime; struct timespec tn_birthtime; - unsigned long tn_gen; /* Head of byte-level lock list (used by tmpfs_advlock). */ struct lockf * tn_lockf; - /* As there is a single vnode for each active file within the - * system, care has to be taken to avoid allocating more than one - * vnode per file. In order to do this, a bidirectional association - * is kept between vnodes and nodes. - * - * Whenever a vnode is allocated, its v_data field is updated to - * point to the node it references. At the same time, the node's - * tn_vnode field is modified to point to the new vnode representing - * it. Further attempts to allocate a vnode for this same node will - * result in returning a new reference to the value stored in - * tn_vnode. - * - * May be NULL when the node is unused (that is, no vnode has been - * allocated for it or it has been reclaimed). */ - kmutex_t tn_vlock; - struct vnode * tn_vnode; - union { - /* Valid when tn_type == VBLK || tn_type == VCHR. */ + /* Type case: VBLK or VCHR. */ struct { dev_t tn_rdev; } tn_dev; - /* Valid when tn_type == VDIR. */ + /* Type case: VDIR. */ struct { - /* Pointer to the parent directory. The root - * directory has a pointer to itself in this field; - * this property identifies the root node. */ + /* Parent directory (root inode points to itself). */ struct tmpfs_node * tn_parent; - /* Head of a tail-queue that links the contents of - * the directory together. See above for a - * description of its contents. */ + /* List of directory entries. */ struct tmpfs_dir tn_dir; - /* Number and pointer of the first directory entry - * returned by the readdir operation if it were - * called again to continue reading data from the - * same directory as before. This is used to speed - * up reads of long directories, assuming that no - * more than one read is in progress at a given time. - * Otherwise, these values are discarded and a linear - * scan is performed from the beginning up to the - * point where readdir starts returning values. */ + /* + * Number and pointer of the last directory entry + * returned by the readdir(3) operation. + */ off_t tn_readdir_lastn; struct tmpfs_dirent * tn_readdir_lastp; } tn_dir; - /* Valid when tn_type == VLNK. */ + /* Type case: VLNK. */ struct tn_lnk { - /* The link's target, allocated from a string pool. */ + /* The link's target. */ char * tn_link; } tn_lnk; - /* Valid when tn_type == VREG. */ + /* Type case: VREG. */ struct tn_reg { - /* The contents of regular files stored in a tmpfs - * file system are represented by a single anonymous - * memory object (aobj, for short). The aobj provides - * direct access to any position within the file, - * because its contents are always mapped in a - * contiguous region of virtual memory. It is a task - * of the memory management subsystem (see uvm(9)) to - * issue the required page ins or page outs whenever - * a position within the file is accessed. */ + /* Underlying UVM object to store contents. */ struct uvm_object * tn_aobj; size_t tn_aobj_pages; } tn_reg; } tn_spec; -}; +} tmpfs_node_t; #if defined(_KERNEL) + LIST_HEAD(tmpfs_node_list, tmpfs_node); -/* --------------------------------------------------------------------- */ +/* Status flags. */ +#define TMPFS_NODE_ACCESSED 0x01 +#define TMPFS_NODE_MODIFIED 0x02 +#define TMPFS_NODE_CHANGED 0x04 + +#define TMPFS_NODE_STATUSALL \ + (TMPFS_NODE_ACCESSED | TMPFS_NODE_MODIFIED | TMPFS_NODE_CHANGED) + +/* + * Bit indicating vnode reclamation. + * We abuse tmpfs_node_t::tn_gen for that. + */ +#define TMPFS_NODE_GEN_MASK (~0UL >> 1) +#define TMPFS_RECLAIMING_BIT (~TMPFS_NODE_GEN_MASK) + +#define TMPFS_NODE_RECLAIMING(node) \ + (((node)->tn_gen & TMPFS_RECLAIMING_BIT) != 0) + +#define TMPFS_NODE_GEN(node) \ + ((node)->tn_gen & TMPFS_NODE_GEN_MASK) + +/* White-out inode indicator. */ +#define TMPFS_NODE_WHITEOUT ((tmpfs_node_t *)-1) /* * Internal representation of a tmpfs mount point. */ -struct tmpfs_mount { - /* Maximum number of memory pages available for use by the file - * system, set during mount time. This variable must never be - * used directly as it may be bigger than the current amount of - * free memory; in the extreme case, it will hold the SIZE_MAX - * value. Instead, use the TMPFS_PAGES_MAX macro. */ - unsigned int tm_pages_max; - - /* Number of pages in use by the file system. Cannot be bigger - * than the value returned by TMPFS_PAGES_MAX in any case. */ - unsigned int tm_pages_used; - - /* Pointer to the node representing the root directory of this - * file system. */ - struct tmpfs_node * tm_root; - - /* Maximum number of possible nodes for this file system; set - * during mount time. We need a hard limit on the maximum number - * of nodes to avoid allocating too much of them; their objects - * cannot be released until the file system is unmounted. - * Otherwise, we could easily run out of memory by creating lots - * of empty files and then simply removing them. */ +typedef struct tmpfs_mount { + /* Limit and number of bytes in use by the file system. */ + uint64_t tm_mem_limit; + uint64_t tm_bytes_used; + kmutex_t tm_acc_lock; + + /* Pointer to the root inode. */ + tmpfs_node_t * tm_root; + + /* Maximum number of possible nodes for this file system. */ unsigned int tm_nodes_max; - /* Number of nodes currently allocated. This number only grows. - * When it reaches tm_nodes_max, no more new nodes can be allocated. - * Of course, the old, unused ones can be reused. */ + /* Number of nodes currently allocated. */ unsigned int tm_nodes_cnt; - /* Node list. */ + /* List of inodes and the lock protecting it. */ kmutex_t tm_lock; struct tmpfs_node_list tm_nodes; - - /* Pools used to store file system meta data. These are not shared - * across several instances of tmpfs for the reasons described in - * tmpfs_pool.c. */ - struct tmpfs_pool tm_dirent_pool; - struct tmpfs_pool tm_node_pool; - struct tmpfs_str_pool tm_str_pool; -}; - -/* --------------------------------------------------------------------- */ +} tmpfs_mount_t; /* * This structure maps a file identifier to a tmpfs node. Used by the * NFS code. */ -struct tmpfs_fid { +typedef struct tmpfs_fid { uint16_t tf_len; uint16_t tf_pad; uint32_t tf_gen; ino_t tf_id; -}; - -/* --------------------------------------------------------------------- */ +} tmpfs_fid_t; /* * Prototypes for tmpfs_subr.c. */ -int tmpfs_alloc_node(struct tmpfs_mount *, enum vtype, - uid_t uid, gid_t gid, mode_t mode, struct tmpfs_node *, - char *, dev_t, struct tmpfs_node **); -void tmpfs_free_node(struct tmpfs_mount *, struct tmpfs_node *); -int tmpfs_alloc_dirent(struct tmpfs_mount *, struct tmpfs_node *, - const char *, uint16_t, struct tmpfs_dirent **); -void tmpfs_free_dirent(struct tmpfs_mount *, struct tmpfs_dirent *, - bool); -int tmpfs_alloc_vp(struct mount *, struct tmpfs_node *, struct vnode **); -void tmpfs_free_vp(struct vnode *); -int tmpfs_alloc_file(struct vnode *, struct vnode **, struct vattr *, - struct componentname *, char *); -void tmpfs_dir_attach(struct vnode *, struct tmpfs_dirent *); -void tmpfs_dir_detach(struct vnode *, struct tmpfs_dirent *); -struct tmpfs_dirent * tmpfs_dir_lookup(struct tmpfs_node *node, - struct componentname *cnp); -int tmpfs_dir_getdotdent(struct tmpfs_node *, struct uio *); -int tmpfs_dir_getdotdotdent(struct tmpfs_node *, struct uio *); -struct tmpfs_dirent * tmpfs_dir_lookupbycookie(struct tmpfs_node *, off_t); -int tmpfs_dir_getdents(struct tmpfs_node *, struct uio *, off_t *); -int tmpfs_reg_resize(struct vnode *, off_t); -size_t tmpfs_mem_info(bool); -int tmpfs_chflags(struct vnode *, int, kauth_cred_t, struct lwp *); -int tmpfs_chmod(struct vnode *, mode_t, kauth_cred_t, struct lwp *); -int tmpfs_chown(struct vnode *, uid_t, gid_t, kauth_cred_t, struct lwp *); -int tmpfs_chsize(struct vnode *, u_quad_t, kauth_cred_t, struct lwp *); -int tmpfs_chtimes(struct vnode *, const struct timespec *, - const struct timespec *, const struct timespec *, int, kauth_cred_t, - struct lwp *); -void tmpfs_itimes(struct vnode *, const struct timespec *, - const struct timespec *, const struct timespec *); - -void tmpfs_update(struct vnode *, const struct timespec *, - const struct timespec *, const struct timespec *, int); -int tmpfs_truncate(struct vnode *, off_t); - -/* --------------------------------------------------------------------- */ - -/* - * Convenience macros to simplify some logical expressions. - */ -#define IMPLIES(a, b) (!(a) || (b)) -#define IFF(a, b) (IMPLIES(a, b) && IMPLIES(b, a)) - -/* --------------------------------------------------------------------- */ - -/* - * Checks that the directory entry pointed by 'de' matches the name 'name' - * with a length of 'len'. - */ -#define TMPFS_DIRENT_MATCHES(de, name, len) \ - (de->td_namelen == (uint16_t)len && \ - memcmp((de)->td_name, (name), (de)->td_namelen) == 0) +int tmpfs_alloc_node(tmpfs_mount_t *, enum vtype, uid_t, gid_t, + mode_t, char *, dev_t, tmpfs_node_t **); +void tmpfs_free_node(tmpfs_mount_t *, tmpfs_node_t *); -/* --------------------------------------------------------------------- */ +int tmpfs_alloc_file(vnode_t *, vnode_t **, struct vattr *, + struct componentname *, char *); + +int tmpfs_vnode_get(struct mount *, tmpfs_node_t *, vnode_t **); + +int tmpfs_alloc_dirent(tmpfs_mount_t *, const char *, uint16_t, + tmpfs_dirent_t **); +void tmpfs_free_dirent(tmpfs_mount_t *, tmpfs_dirent_t *); +void tmpfs_dir_attach(vnode_t *, tmpfs_dirent_t *, tmpfs_node_t *); +void tmpfs_dir_detach(vnode_t *, tmpfs_dirent_t *); + +tmpfs_dirent_t *tmpfs_dir_lookup(tmpfs_node_t *, struct componentname *); +tmpfs_dirent_t *tmpfs_dir_cached(tmpfs_node_t *); + +int tmpfs_dir_getdotdent(tmpfs_node_t *, struct uio *); +int tmpfs_dir_getdotdotdent(tmpfs_node_t *, struct uio *); +tmpfs_dirent_t *tmpfs_dir_lookupbycookie(tmpfs_node_t *, off_t); +int tmpfs_dir_getdents(tmpfs_node_t *, struct uio *, off_t *); + +int tmpfs_reg_resize(vnode_t *, off_t); +int tmpfs_truncate(vnode_t *, off_t); + +int tmpfs_chflags(vnode_t *, int, kauth_cred_t, lwp_t *); +int tmpfs_chmod(vnode_t *, mode_t, kauth_cred_t, lwp_t *); +int tmpfs_chown(vnode_t *, uid_t, gid_t, kauth_cred_t, lwp_t *); +int tmpfs_chsize(vnode_t *, u_quad_t, kauth_cred_t, lwp_t *); +int tmpfs_chtimes(vnode_t *, const struct timespec *, + const struct timespec *, const struct timespec *, int, + kauth_cred_t, lwp_t *); +void tmpfs_update(vnode_t *, const struct timespec *, + const struct timespec *, const struct timespec *, int); + +/* + * Prototypes for tmpfs_mem.c. + */ + +void tmpfs_mntmem_init(tmpfs_mount_t *, uint64_t); +void tmpfs_mntmem_destroy(tmpfs_mount_t *); + +size_t tmpfs_mem_info(bool); +uint64_t tmpfs_bytes_max(tmpfs_mount_t *); +size_t tmpfs_pages_avail(tmpfs_mount_t *); +bool tmpfs_mem_incr(tmpfs_mount_t *, size_t); +void tmpfs_mem_decr(tmpfs_mount_t *, size_t); + +tmpfs_dirent_t *tmpfs_dirent_get(tmpfs_mount_t *); +void tmpfs_dirent_put(tmpfs_mount_t *, tmpfs_dirent_t *); + +tmpfs_node_t * tmpfs_node_get(tmpfs_mount_t *); +void tmpfs_node_put(tmpfs_mount_t *, tmpfs_node_t *); + +char * tmpfs_strname_alloc(tmpfs_mount_t *, size_t); +void tmpfs_strname_free(tmpfs_mount_t *, char *, size_t); +bool tmpfs_strname_neqlen(struct componentname *, struct componentname *); /* * Ensures that the node pointed by 'node' is a directory and that its @@ -402,99 +322,51 @@ int tmpfs_truncate(struct vnode *, off_t */ #define TMPFS_VALIDATE_DIR(node) \ KASSERT((node)->tn_type == VDIR); \ - KASSERT((node)->tn_size % sizeof(struct tmpfs_dirent) == 0); \ + KASSERT((node)->tn_size % sizeof(tmpfs_dirent_t) == 0); \ KASSERT((node)->tn_spec.tn_dir.tn_readdir_lastp == NULL || \ tmpfs_dircookie((node)->tn_spec.tn_dir.tn_readdir_lastp) == \ (node)->tn_spec.tn_dir.tn_readdir_lastn); -/* --------------------------------------------------------------------- */ - /* * Memory management stuff. */ -/* Amount of memory pages to reserve for the system (e.g., to not use by - * tmpfs). - * XXX: Should this be tunable through sysctl, for instance? */ -#define TMPFS_PAGES_RESERVED (4 * 1024 * 1024 / PAGE_SIZE) - -/* Returns the maximum size allowed for a tmpfs file system. This macro - * must be used instead of directly retrieving the value from tm_pages_max. - * The reason is that the size of a tmpfs file system is dynamic: it lets - * the user store files as long as there is enough free memory (including - * physical memory and swap space). Therefore, the amount of memory to be - * used is either the limit imposed by the user during mount time or the - * amount of available memory, whichever is lower. To avoid consuming all - * the memory for a given mount point, the system will always reserve a - * minimum of TMPFS_PAGES_RESERVED pages, which is also taken into account - * by this macro (see above). */ -static __inline size_t -TMPFS_PAGES_MAX(struct tmpfs_mount *tmp) -{ - size_t freepages; - - freepages = tmpfs_mem_info(false); - if (freepages < TMPFS_PAGES_RESERVED) - freepages = 0; - else - freepages -= TMPFS_PAGES_RESERVED; - - return MIN(tmp->tm_pages_max, freepages + tmp->tm_pages_used); -} - -/* Returns the available space for the given file system. */ -#define TMPFS_PAGES_AVAIL(tmp) \ - ((ssize_t)(TMPFS_PAGES_MAX(tmp) - (tmp)->tm_pages_used)) - -/* --------------------------------------------------------------------- */ +/* Amount of memory pages to reserve for the system. */ +#define TMPFS_PAGES_RESERVED (4 * 1024 * 1024 / PAGE_SIZE) /* - * Macros/functions to convert from generic data structures to tmpfs - * specific ones. + * Routines to convert VFS structures to tmpfs internal ones. */ -static __inline -struct tmpfs_mount * +static inline tmpfs_mount_t * VFS_TO_TMPFS(struct mount *mp) { - struct tmpfs_mount *tmp; + tmpfs_mount_t *tmp = mp->mnt_data; -#ifdef KASSERT - KASSERT((mp) != NULL && (mp)->mnt_data != NULL); -#endif - tmp = (struct tmpfs_mount *)(mp)->mnt_data; + KASSERT(tmp != NULL); return tmp; } -#endif /* defined(_KERNEL) */ - -static __inline -struct tmpfs_node * -VP_TO_TMPFS_NODE(struct vnode *vp) +static inline tmpfs_node_t * +VP_TO_TMPFS_DIR(vnode_t *vp) { - struct tmpfs_node *node; + tmpfs_node_t *node = vp->v_data; -#ifdef KASSERT - KASSERT((vp) != NULL && (vp)->v_data != NULL); -#endif - node = (struct tmpfs_node *)vp->v_data; + KASSERT(node != NULL); + TMPFS_VALIDATE_DIR(node); return node; } -#if defined(_KERNEL) +#endif /* defined(_KERNEL) */ -static __inline -struct tmpfs_node * -VP_TO_TMPFS_DIR(struct vnode *vp) +static __inline tmpfs_node_t * +VP_TO_TMPFS_NODE(vnode_t *vp) { - struct tmpfs_node *node; - - node = VP_TO_TMPFS_NODE(vp); + tmpfs_node_t *node = vp->v_data; #ifdef KASSERT - TMPFS_VALIDATE_DIR(node); + KASSERT(node != NULL); #endif return node; } -#endif /* defined(_KERNEL) */ #endif /* _FS_TMPFS_TMPFS_H_ */