svn commit: r185766 - in head/sys: compat/linprocfs fs/procfs

[Konstantin Belousov]

Author: kib
Date: Mon Dec  8 13:15:31 2008
New Revision: 185766
URL: http://svn.freebsd.org/changeset/base/185766

Log:
  Make two style changes to create new commit and document proper commit
  message for r185765.
  
  Noted by:	rdivacky
  Requested by:	des
  
  Commit message for r185765 should be:
  In procfs map handler, and in linprocfs maps handler, do not call
  vn_fullpath() while having vm map locked. This is done in anticipation
  of the vop_vptocnp commit, that would make vn_fullpath sometime
  acquire vnode lock.
  
  Also, in linprocfs, maps handler already acquires vnode lock.
  
  No objections from:	des
  MFC after:	2 week

Modified:
  head/sys/compat/linprocfs/linprocfs.c
  head/sys/fs/procfs/procfs_map.c

Modified: head/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- head/sys/compat/linprocfs/linprocfs.c	Mon Dec  8 12:34:52 2008	(r185765)
+++ head/sys/compat/linprocfs/linprocfs.c	Mon Dec  8 13:15:31 2008	(r185766)
@@ -273,8 +273,7 @@ linprocfs_docpuinfo(PFS_FILL_ARGS)
 		/* XXX per-cpu vendor / class / model / id? */
 	}
 
-	sbuf_cat(sb,
-	    "flags\t\t:");
+	sbuf_cat(sb, "flags\t\t:");
 
 	if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) {
 		flags[16] = "fcmov";

Modified: head/sys/fs/procfs/procfs_map.c
==============================================================================
--- head/sys/fs/procfs/procfs_map.c	Mon Dec  8 12:34:52 2008	(r185765)
+++ head/sys/fs/procfs/procfs_map.c	Mon Dec  8 13:15:31 2008	(r185766)
@@ -82,11 +82,11 @@ extern struct sysentvec ia32_freebsd_sys
 int
 procfs_doprocmap(PFS_FILL_ARGS)
 {
-	int error, vfslocked;
 	vm_map_t map = &p->p_vmspace->vm_map;
 	vm_map_entry_t entry, tmp_entry;
 	struct vnode *vp;
 	char *fullpath, *freepath;
+	int error, vfslocked;
 	unsigned int last_timestamp;
 #ifdef COMPAT_IA32
 	int wrap32 = 0;