PERFORCE change 165426 for review

[Edward Tomasz Napierala]

http://perforce.freebsd.org/chv.cgi?CH=165426

Change 165426 by trasz at trasz_victim on 2009/06/29 18:51:23

	Little renaming.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#19 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#14 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#9 (text+ko) ====

@@ -747,7 +747,7 @@
 	 * out for a race.
 	 */
 	if (flags & DUP_FIXED) {
-		error = hrl_alloc_proc(p, HRL_RESOURCE_OPENFILES, 1);
+		error = hrl_alloc_proc(p, HRL_RESOURCE_FILEDESCRIPTORS, 1);
 		if (error) {
 			FILEDESC_XUNLOCK(fdp);
 			fdrop(fp, td);
@@ -775,7 +775,7 @@
 		if (fdp->fd_ofiles[new] == NULL)
 			fdunused(fdp, new);
 		FILEDESC_XUNLOCK(fdp);
-		hrl_free_proc(p, HRL_RESOURCE_OPENFILES, 1);
+		hrl_free_proc(p, HRL_RESOURCE_FILEDESCRIPTORS, 1);
 		fdrop(fp, td);
 		return (EBADF);
 	}
@@ -820,7 +820,7 @@
 	 */
 	if (delfp != NULL) {
 		knote_fdclose(td, new);
-		hrl_free_proc(td->td_proc, HRL_RESOURCE_OPENFILES, 1);
+		hrl_free_proc(td->td_proc, HRL_RESOURCE_FILEDESCRIPTORS, 1);
 		if (delfp->f_type == DTYPE_MQUEUE)
 			mq_fdclose(td, new, delfp);
 		FILEDESC_XUNLOCK(fdp);
@@ -1119,7 +1119,7 @@
 	 * added, and deleteing a knote for the new fd.
 	 */
 	knote_fdclose(td, fd);
-	hrl_free_proc(td->td_proc, HRL_RESOURCE_OPENFILES, 1);
+	hrl_free_proc(td->td_proc, HRL_RESOURCE_FILEDESCRIPTORS, 1);
 	if (fp->f_type == DTYPE_MQUEUE)
 		mq_fdclose(td, fd, fp);
 	FILEDESC_XUNLOCK(fdp);
@@ -1410,7 +1410,7 @@
 	if (fdp->fd_freefile > minfd)
 		minfd = fdp->fd_freefile;	   
 
-	error = hrl_alloc_proc(p, HRL_RESOURCE_OPENFILES, 1);
+	error = hrl_alloc_proc(p, HRL_RESOURCE_FILEDESCRIPTORS, 1);
 	if (error)
 		return (EMFILE);
 
@@ -1701,7 +1701,7 @@
 	if (fdp == NULL)
 		return;
 
-	hrl_allocated_proc(td->td_proc, HRL_RESOURCE_OPENFILES, 0);
+	hrl_allocated_proc(td->td_proc, HRL_RESOURCE_FILEDESCRIPTORS, 0);
 
 	/* Check for special need to clear POSIX style locks */
 	fdtol = td->td_proc->p_fdtol;
@@ -1879,7 +1879,7 @@
 			struct file *fp;
 
 			knote_fdclose(td, i);
-			hrl_free_proc(td->td_proc, HRL_RESOURCE_OPENFILES, 1);
+			hrl_free_proc(td->td_proc, HRL_RESOURCE_FILEDESCRIPTORS, 1);
 			/*
 			 * NULL-out descriptor prior to close to avoid
 			 * a race while close blocks.
@@ -1944,7 +1944,7 @@
 			struct file *fp;
 
 			knote_fdclose(td, i);
-			hrl_free_proc(td->td_proc, HRL_RESOURCE_OPENFILES, 1);
+			hrl_free_proc(td->td_proc, HRL_RESOURCE_FILEDESCRIPTORS, 1);
 			/*
 			 * NULL-out descriptor prior to close to avoid
 			 * a race while close blocks.

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#19 (text+ko) ====

@@ -79,7 +79,7 @@
 	{ "memoryuse", HRL_RESOURCE_MEMORYUSE },
 	{ "memorylocked", HRL_RESOURCE_MEMORYLOCKED },
 	{ "maxprocesses", HRL_RESOURCE_MAXPROCESSES },
-	{ "openfiles", HRL_RESOURCE_OPENFILES },
+	{ "filedescriptors", HRL_RESOURCE_FILEDESCRIPTORS },
 	{ "sbsize", HRL_RESOURCE_SBSIZE },
 	{ "vmemoryuse", HRL_RESOURCE_VMEMORYUSE },
 	{ NULL, -1 }};

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#9 (text+ko) ====

@@ -691,7 +691,7 @@
 		id = td->td_ucred->cr_uid;
 		break;
 	case RLIMIT_NOFILE:
-		resource = HRL_RESOURCE_OPENFILES;
+		resource = HRL_RESOURCE_FILEDESCRIPTORS;
 		action = HRL_ACTION_SIGXFSZ;
 		break;
 	case RLIMIT_SBSIZE:

==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#14 (text+ko) ====

@@ -75,7 +75,7 @@
 #define	HRL_RESOURCE_MEMORYUSE		0x0006
 #define	HRL_RESOURCE_MEMORYLOCKED	0x0007
 #define	HRL_RESOURCE_MAXPROCESSES	0x0008
-#define	HRL_RESOURCE_OPENFILES		0x0009
+#define	HRL_RESOURCE_FILEDESCRIPTORS	0x0009
 #define	HRL_RESOURCE_SBSIZE		0x000a
 #define	HRL_RESOURCE_VMEMORYUSE		0x000b
 #define	HRL_RESOURCE_PTY		0x000c