svn commit: r202187 - head/sys/fs/tmpfs

Jaakko Heinonen jh at FreeBSD.org
Wed Jan 13 14:17:22 UTC 2010


Author: jh
Date: Wed Jan 13 14:17:21 2010
New Revision: 202187
URL: http://svn.freebsd.org/changeset/base/202187

Log:
  - Fix some style bugs in tmpfs_mount(). [1]
  - Remove a stale comment about tmpfs_mem_info() 'total' argument.
  
  Reported by:	bde [1]

Modified:
  head/sys/fs/tmpfs/tmpfs.h
  head/sys/fs/tmpfs/tmpfs_vfsops.c

Modified: head/sys/fs/tmpfs/tmpfs.h
==============================================================================
--- head/sys/fs/tmpfs/tmpfs.h	Wed Jan 13 12:21:58 2010	(r202186)
+++ head/sys/fs/tmpfs/tmpfs.h	Wed Jan 13 14:17:21 2010	(r202187)
@@ -493,10 +493,6 @@ int	tmpfs_truncate(struct vnode *, off_t
  * Returns information about the number of available memory pages,
  * including physical and virtual ones.
  *
- * If 'total' is TRUE, the value returned is the total amount of memory
- * pages configured for the system (either in use or free).
- * If it is FALSE, the value returned is the amount of free memory pages.
- *
  * Remember to remove TMPFS_PAGES_RESERVED from the returned value to avoid
  * excessive memory usage.
  *

Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vfsops.c	Wed Jan 13 12:21:58 2010	(r202186)
+++ head/sys/fs/tmpfs/tmpfs_vfsops.c	Wed Jan 13 14:17:21 2010	(r202187)
@@ -185,15 +185,15 @@ tmpfs_mount(struct mount *mp)
 	ino_t nodes;
 	int error;
 	/* Size counters. */
-	ino_t		nodes_max;
-	u_quad_t	size_max;
+	ino_t nodes_max;
+	u_quad_t size_max;
 
 	/* Root node attributes. */
-	uid_t	root_uid;
-	gid_t	root_gid;
-	mode_t	root_mode;
+	uid_t root_uid;
+	gid_t root_gid;
+	mode_t root_mode;
 
-	struct vattr	va;
+	struct vattr va;
 
 	if (vfs_filteropt(mp->mnt_optnew, tmpfs_opts))
 		return (EINVAL);
@@ -239,7 +239,7 @@ tmpfs_mount(struct mount *mp)
 	 * allowed to use, based on the maximum size the user passed in
 	 * the mount structure.  A value of zero is treated as if the
 	 * maximum available space was requested. */
-	if (size_max < PAGE_SIZE || size_max > (SIZE_MAX - PAGE_SIZE))
+	if (size_max < PAGE_SIZE || size_max > SIZE_MAX - PAGE_SIZE)
 		pages = SIZE_MAX;
 	else
 		pages = howmany(size_max, PAGE_SIZE);


More information about the svn-src-all mailing list