Date: Mon, 14 Jul 2014 08:17:12 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268605 - head/sys/fs/tmpfs Message-ID: <201407140817.s6E8HCWI019379@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Mon Jul 14 08:17:11 2014 New Revision: 268605 URL: http://svnweb.freebsd.org/changeset/base/268605 Log: Remove code separator lines which do not conform to style(9). Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Modified: head/sys/fs/tmpfs/tmpfs.h head/sys/fs/tmpfs/tmpfs_fifoops.c head/sys/fs/tmpfs/tmpfs_fifoops.h head/sys/fs/tmpfs/tmpfs_subr.c head/sys/fs/tmpfs/tmpfs_vfsops.c head/sys/fs/tmpfs/tmpfs_vnops.c head/sys/fs/tmpfs/tmpfs_vnops.h Modified: head/sys/fs/tmpfs/tmpfs.h ============================================================================== --- head/sys/fs/tmpfs/tmpfs.h Mon Jul 14 07:30:04 2014 (r268604) +++ head/sys/fs/tmpfs/tmpfs.h Mon Jul 14 08:17:11 2014 (r268605) @@ -35,9 +35,6 @@ #ifndef _FS_TMPFS_TMPFS_H_ #define _FS_TMPFS_TMPFS_H_ -/* --------------------------------------------------------------------- - * KERNEL-SPECIFIC DEFINITIONS - * --------------------------------------------------------------------- */ #include <sys/dirent.h> #include <sys/mount.h> #include <sys/queue.h> @@ -46,7 +43,6 @@ #include <sys/lock.h> #include <sys/mutex.h> -/* --------------------------------------------------------------------- */ #include <sys/malloc.h> #include <sys/systm.h> #include <sys/tree.h> @@ -56,8 +52,6 @@ MALLOC_DECLARE(M_TMPFSMNT); MALLOC_DECLARE(M_TMPFSNAME); -/* --------------------------------------------------------------------- */ - /* * Internal representation of a tmpfs directory entry. */ @@ -137,8 +131,6 @@ RB_HEAD(tmpfs_dir, tmpfs_dirent); #define TMPFS_DIRCOOKIE_DUP_MAX \ (TMPFS_DIRCOOKIE_DUP | TMPFS_DIRCOOKIE_MASK) -/* --------------------------------------------------------------------- */ - /* * Internal representation of a tmpfs file system node. * @@ -308,7 +300,6 @@ LIST_HEAD(tmpfs_node_list, tmpfs_node); #define TMPFS_VNODE_WANT 2 #define TMPFS_VNODE_DOOMED 4 #define TMPFS_VNODE_WRECLAIM 8 -/* --------------------------------------------------------------------- */ /* * Internal representation of a tmpfs mount point. @@ -375,8 +366,6 @@ struct tmpfs_mount { #define TMPFS_LOCK(tm) mtx_lock(&(tm)->allnode_lock) #define TMPFS_UNLOCK(tm) mtx_unlock(&(tm)->allnode_lock) -/* --------------------------------------------------------------------- */ - /* * This structure maps a file identifier to a tmpfs node. Used by the * NFS code. @@ -388,8 +377,6 @@ struct tmpfs_fid { unsigned long tf_gen; }; -/* --------------------------------------------------------------------- */ - #ifdef _KERNEL /* * Prototypes for tmpfs_subr.c. @@ -433,16 +420,12 @@ void tmpfs_itimes(struct vnode *, const void tmpfs_update(struct vnode *); 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'. @@ -451,8 +434,6 @@ int tmpfs_truncate(struct vnode *, off_t (de->td_namelen == len && \ bcmp((de)->ud.td_name, (name), (de)->td_namelen) == 0) -/* --------------------------------------------------------------------- */ - /* * Ensures that the node pointed by 'node' is a directory and that its * contents are consistent with respect to directories. @@ -462,8 +443,6 @@ int tmpfs_truncate(struct vnode *, off_t MPASS((node)->tn_size % sizeof(struct tmpfs_dirent) == 0); \ } while (0) -/* --------------------------------------------------------------------- */ - /* * Memory management stuff. */ @@ -480,8 +459,6 @@ size_t tmpfs_pages_used(struct tmpfs_mou #endif -/* --------------------------------------------------------------------- */ - /* * Macros/functions to convert from generic data structures to tmpfs * specific ones. Modified: head/sys/fs/tmpfs/tmpfs_fifoops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_fifoops.c Mon Jul 14 07:30:04 2014 (r268604) +++ head/sys/fs/tmpfs/tmpfs_fifoops.c Mon Jul 14 08:17:11 2014 (r268605) @@ -48,8 +48,6 @@ #include <fs/tmpfs/tmpfs_fifoops.h> #include <fs/tmpfs/tmpfs_vnops.h> -/* --------------------------------------------------------------------- */ - static int tmpfs_fifo_kqfilter(struct vop_kqfilter_args *ap) { @@ -71,8 +69,6 @@ tmpfs_fifo_kqfilter(struct vop_kqfilter_ return fifo_specops.vop_kqfilter(ap); } -/* --------------------------------------------------------------------- */ - static int tmpfs_fifo_close(struct vop_close_args *v) { Modified: head/sys/fs/tmpfs/tmpfs_fifoops.h ============================================================================== --- head/sys/fs/tmpfs/tmpfs_fifoops.h Mon Jul 14 07:30:04 2014 (r268604) +++ head/sys/fs/tmpfs/tmpfs_fifoops.h Mon Jul 14 08:17:11 2014 (r268605) @@ -41,13 +41,10 @@ #include <fs/tmpfs/tmpfs_vnops.h> -/* --------------------------------------------------------------------- */ - /* * Declarations for tmpfs_fifoops.c. */ extern struct vop_vector tmpfs_fifoop_entries; -/* --------------------------------------------------------------------- */ #endif /* _FS_TMPFS_TMPFS_FIFOOPS_H_ */ Modified: head/sys/fs/tmpfs/tmpfs_subr.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_subr.c Mon Jul 14 07:30:04 2014 (r268604) +++ head/sys/fs/tmpfs/tmpfs_subr.c Mon Jul 14 08:17:11 2014 (r268605) @@ -136,8 +136,6 @@ tmpfs_pages_check_avail(struct tmpfs_mou return (1); } -/* --------------------------------------------------------------------- */ - /* * Allocates a new node of type 'type' inside the 'tmp' mount point, with * its owner set to 'uid', its group to 'gid' and its mode set to 'mode', @@ -251,8 +249,6 @@ tmpfs_alloc_node(struct tmpfs_mount *tmp return 0; } -/* --------------------------------------------------------------------- */ - /* * Destroys the node pointed to by node from the file system 'tmp'. * If the node does not belong to the given mount point, the results are @@ -328,8 +324,6 @@ tmpfs_free_node(struct tmpfs_mount *tmp, uma_zfree(tmp->tm_node_pool, node); } -/* --------------------------------------------------------------------- */ - static __inline uint32_t tmpfs_dirent_hash(const char *name, u_int len) { @@ -406,8 +400,6 @@ tmpfs_alloc_dirent(struct tmpfs_mount *t return 0; } -/* --------------------------------------------------------------------- */ - /* * Frees a directory entry. It is the caller's responsibility to destroy * the node referenced by it if needed. @@ -432,8 +424,6 @@ tmpfs_free_dirent(struct tmpfs_mount *tm uma_zfree(tmp->tm_dirent_pool, de); } -/* --------------------------------------------------------------------- */ - void tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj) { @@ -631,8 +621,6 @@ out: return error; } -/* --------------------------------------------------------------------- */ - /* * Destroys the association between the vnode vp and the node it * references. @@ -652,8 +640,6 @@ tmpfs_free_vp(struct vnode *vp) vp->v_data = NULL; } -/* --------------------------------------------------------------------- */ - /* * Allocates a new file of type 'type' and adds it to the parent directory * 'dvp'; this addition is done using the component name given in 'cnp'. @@ -733,8 +719,6 @@ out: return error; } -/* --------------------------------------------------------------------- */ - static struct tmpfs_dirent * tmpfs_dir_first(struct tmpfs_node *dnode, struct tmpfs_dir_cursor *dc) { @@ -990,8 +974,6 @@ tmpfs_dir_attach(struct vnode *vp, struc TMPFS_NODE_MODIFIED; } -/* --------------------------------------------------------------------- */ - /* * Detaches the directory entry de from the directory represented by vp. * Note that this does not change the link count of the node pointed by @@ -1057,8 +1039,6 @@ tmpfs_dir_destroy(struct tmpfs_mount *tm } } -/* --------------------------------------------------------------------- */ - /* * Helper function for tmpfs_readdir. Creates a '.' entry for the given * directory and returns it in the uio space. The function returns 0 @@ -1092,8 +1072,6 @@ tmpfs_dir_getdotdent(struct tmpfs_node * return error; } -/* --------------------------------------------------------------------- */ - /* * Helper function for tmpfs_readdir. Creates a '..' entry for the given * directory and returns it in the uio space. The function returns 0 @@ -1139,8 +1117,6 @@ tmpfs_dir_getdotdotdent(struct tmpfs_nod return error; } -/* --------------------------------------------------------------------- */ - /* * Helper function for tmpfs_readdir. Returns as much directory entries * as can fit in the uio space. The read starts at uio->uio_offset. @@ -1310,8 +1286,6 @@ tmpfs_dir_whiteout_remove(struct vnode * tmpfs_free_dirent(VFS_TO_TMPFS(dvp->v_mount), de); } -/* --------------------------------------------------------------------- */ - /* * Resizes the aobj associated with the regular file pointed to by 'vp' to the * size 'newsize'. 'vp' must point to a vnode that represents a regular file. @@ -1422,8 +1396,6 @@ retry: return (0); } -/* --------------------------------------------------------------------- */ - /* * Change flags of the given vnode. * Caller should execute tmpfs_update on vp after a successful execution. @@ -1481,8 +1453,6 @@ tmpfs_chflags(struct vnode *vp, u_long f return 0; } -/* --------------------------------------------------------------------- */ - /* * Change access mode on the given vnode. * Caller should execute tmpfs_update on vp after a successful execution. @@ -1539,8 +1509,6 @@ tmpfs_chmod(struct vnode *vp, mode_t mod return 0; } -/* --------------------------------------------------------------------- */ - /* * Change ownership of the given vnode. At least one of uid or gid must * be different than VNOVAL. If one is set to that value, the attribute @@ -1612,8 +1580,6 @@ tmpfs_chown(struct vnode *vp, uid_t uid, return 0; } -/* --------------------------------------------------------------------- */ - /* * Change size of the given vnode. * Caller should execute tmpfs_update on vp after a successful execution. @@ -1669,8 +1635,6 @@ tmpfs_chsize(struct vnode *vp, u_quad_t return error; } -/* --------------------------------------------------------------------- */ - /* * Change access and modification times of the given vnode. * Caller should execute tmpfs_update on vp after a successful execution. @@ -1719,7 +1683,6 @@ tmpfs_chtimes(struct vnode *vp, struct v return 0; } -/* --------------------------------------------------------------------- */ /* Sync timestamps */ void tmpfs_itimes(struct vnode *vp, const struct timespec *acc, @@ -1752,8 +1715,6 @@ tmpfs_itimes(struct vnode *vp, const str ~(TMPFS_NODE_ACCESSED | TMPFS_NODE_MODIFIED | TMPFS_NODE_CHANGED); } -/* --------------------------------------------------------------------- */ - void tmpfs_update(struct vnode *vp) { @@ -1761,8 +1722,6 @@ tmpfs_update(struct vnode *vp) tmpfs_itimes(vp, NULL, NULL); } -/* --------------------------------------------------------------------- */ - int tmpfs_truncate(struct vnode *vp, off_t length) { Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vfsops.c Mon Jul 14 07:30:04 2014 (r268604) +++ head/sys/fs/tmpfs/tmpfs_vfsops.c Mon Jul 14 08:17:11 2014 (r268605) @@ -68,8 +68,6 @@ __FBSDID("$FreeBSD$"); MALLOC_DEFINE(M_TMPFSMNT, "tmpfs mount", "tmpfs mount structures"); MALLOC_DEFINE(M_TMPFSNAME, "tmpfs name", "tmpfs file names"); -/* --------------------------------------------------------------------- */ - static int tmpfs_mount(struct mount *); static int tmpfs_unmount(struct mount *, int); static int tmpfs_root(struct mount *, int flags, struct vnode **); @@ -77,8 +75,6 @@ static int tmpfs_fhtovp(struct mount *, struct vnode **); static int tmpfs_statfs(struct mount *, struct statfs *); -/* --------------------------------------------------------------------- */ - static const char *tmpfs_opts[] = { "from", "size", "maxfilesize", "inodes", "uid", "gid", "mode", "export", "union", NULL @@ -88,8 +84,6 @@ static const char *tmpfs_updateopts[] = "from", "export", NULL }; -/* --------------------------------------------------------------------- */ - static int tmpfs_node_ctor(void *mem, int size, void *arg, int flags) { @@ -271,8 +265,6 @@ tmpfs_mount(struct mount *mp) return 0; } -/* --------------------------------------------------------------------- */ - /* ARGSUSED2 */ static int tmpfs_unmount(struct mount *mp, int mntflags) @@ -328,8 +320,6 @@ tmpfs_unmount(struct mount *mp, int mntf return 0; } -/* --------------------------------------------------------------------- */ - static int tmpfs_root(struct mount *mp, int flags, struct vnode **vpp) { @@ -342,8 +332,6 @@ tmpfs_root(struct mount *mp, int flags, return error; } -/* --------------------------------------------------------------------- */ - static int tmpfs_fhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp) @@ -380,8 +368,6 @@ tmpfs_fhtovp(struct mount *mp, struct fi return (EINVAL); } -/* --------------------------------------------------------------------- */ - /* ARGSUSED2 */ static int tmpfs_statfs(struct mount *mp, struct statfs *sbp) @@ -415,8 +401,6 @@ tmpfs_statfs(struct mount *mp, struct st return 0; } -/* --------------------------------------------------------------------- */ - /* * tmpfs vfs operations. */ Modified: head/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vnops.c Mon Jul 14 07:30:04 2014 (r268604) +++ head/sys/fs/tmpfs/tmpfs_vnops.c Mon Jul 14 08:17:11 2014 (r268605) @@ -68,8 +68,6 @@ SYSCTL_INT(_vfs_tmpfs, OID_AUTO, rename_ __DEVOLATILE(int *, &tmpfs_rename_restarts), 0, "Times rename had to restart due to lock contention"); -/* --------------------------------------------------------------------- */ - static int tmpfs_lookup(struct vop_cachedlookup_args *v) { @@ -207,8 +205,6 @@ out: return error; } -/* --------------------------------------------------------------------- */ - static int tmpfs_create(struct vop_create_args *v) { @@ -221,7 +217,6 @@ tmpfs_create(struct vop_create_args *v) return tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL); } -/* --------------------------------------------------------------------- */ static int tmpfs_mknod(struct vop_mknod_args *v) @@ -238,8 +233,6 @@ tmpfs_mknod(struct vop_mknod_args *v) return tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL); } -/* --------------------------------------------------------------------- */ - static int tmpfs_open(struct vop_open_args *v) { @@ -272,8 +265,6 @@ tmpfs_open(struct vop_open_args *v) return error; } -/* --------------------------------------------------------------------- */ - static int tmpfs_close(struct vop_close_args *v) { @@ -285,8 +276,6 @@ tmpfs_close(struct vop_close_args *v) return (0); } -/* --------------------------------------------------------------------- */ - int tmpfs_access(struct vop_access_args *v) { @@ -341,8 +330,6 @@ out: return error; } -/* --------------------------------------------------------------------- */ - int tmpfs_getattr(struct vop_getattr_args *v) { @@ -504,8 +491,6 @@ out: return (error); } -/* --------------------------------------------------------------------- */ - static int tmpfs_fsync(struct vop_fsync_args *v) { @@ -518,8 +503,6 @@ tmpfs_fsync(struct vop_fsync_args *v) return 0; } -/* --------------------------------------------------------------------- */ - static int tmpfs_remove(struct vop_remove_args *v) { @@ -572,8 +555,6 @@ out: return error; } -/* --------------------------------------------------------------------- */ - static int tmpfs_link(struct vop_link_args *v) { @@ -640,8 +621,6 @@ out: return error; } -/* --------------------------------------------------------------------- */ - /* * We acquire all but fdvp locks using non-blocking acquisitions. If we * fail to acquire any lock in the path we will drop all held locks, @@ -1051,8 +1030,6 @@ out: return error; } -/* --------------------------------------------------------------------- */ - static int tmpfs_mkdir(struct vop_mkdir_args *v) { @@ -1066,8 +1043,6 @@ tmpfs_mkdir(struct vop_mkdir_args *v) return tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL); } -/* --------------------------------------------------------------------- */ - static int tmpfs_rmdir(struct vop_rmdir_args *v) { @@ -1161,8 +1136,6 @@ out: return error; } -/* --------------------------------------------------------------------- */ - static int tmpfs_symlink(struct vop_symlink_args *v) { @@ -1181,8 +1154,6 @@ tmpfs_symlink(struct vop_symlink_args *v return tmpfs_alloc_file(dvp, vpp, vap, cnp, target); } -/* --------------------------------------------------------------------- */ - static int tmpfs_readdir(struct vop_readdir_args *v) { @@ -1235,8 +1206,6 @@ tmpfs_readdir(struct vop_readdir_args *v return error; } -/* --------------------------------------------------------------------- */ - static int tmpfs_readlink(struct vop_readlink_args *v) { @@ -1258,8 +1227,6 @@ tmpfs_readlink(struct vop_readlink_args return error; } -/* --------------------------------------------------------------------- */ - static int tmpfs_inactive(struct vop_inactive_args *v) { @@ -1275,8 +1242,6 @@ tmpfs_inactive(struct vop_inactive_args return 0; } -/* --------------------------------------------------------------------- */ - int tmpfs_reclaim(struct vop_reclaim_args *v) { @@ -1314,8 +1279,6 @@ tmpfs_reclaim(struct vop_reclaim_args *v return 0; } -/* --------------------------------------------------------------------- */ - static int tmpfs_print(struct vop_print_args *v) { @@ -1339,8 +1302,6 @@ tmpfs_print(struct vop_print_args *v) return 0; } -/* --------------------------------------------------------------------- */ - static int tmpfs_pathconf(struct vop_pathconf_args *v) { @@ -1430,8 +1391,6 @@ tmpfs_whiteout(struct vop_whiteout_args } } -/* --------------------------------------------------------------------- */ - /* * vnode operations vector used for files stored in a tmpfs file system. */ Modified: head/sys/fs/tmpfs/tmpfs_vnops.h ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vnops.h Mon Jul 14 07:30:04 2014 (r268604) +++ head/sys/fs/tmpfs/tmpfs_vnops.h Mon Jul 14 08:17:11 2014 (r268605) @@ -39,8 +39,6 @@ #error not supposed to be exposed to userland. #endif -/* --------------------------------------------------------------------- */ - /* * Declarations for tmpfs_vnops.c. */ @@ -52,6 +50,4 @@ vop_getattr_t tmpfs_getattr; vop_setattr_t tmpfs_setattr; vop_reclaim_t tmpfs_reclaim; -/* --------------------------------------------------------------------- */ - #endif /* _FS_TMPFS_TMPFS_VNOPS_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407140817.s6E8HCWI019379>