svn commit: r235506 - projects/pf/head/sys/contrib/pf/net

[Gleb Smirnoff]

Author: glebius
Date: Wed May 16 12:05:55 2012
New Revision: 235506
URL: http://svn.freebsd.org/changeset/base/235506

Log:
  Remove unnecessary locking when checking arguemnts of DIOCADDADDR.

Modified:
  projects/pf/head/sys/contrib/pf/net/pf_ioctl.c

Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Wed May 16 12:00:31 2012	(r235505)
+++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Wed May 16 12:05:55 2012	(r235506)
@@ -2199,22 +2199,18 @@ DIOCGETSTATES_full:
 	case DIOCADDADDR: {
 		struct pfioc_pooladdr	*pp = (struct pfioc_pooladdr *)addr;
 
-		PF_LOCK();
 		if (pp->ticket != V_ticket_pabuf) {
-			PF_UNLOCK();
 			error = EBUSY;
 			break;
 		}
 #ifndef INET
 		if (pp->af == AF_INET) {
-			PF_UNLOCK();
 			error = EAFNOSUPPORT;
 			break;
 		}
 #endif /* INET */
 #ifndef INET6
 		if (pp->af == AF_INET6) {
-			PF_UNLOCK();
 			error = EAFNOSUPPORT;
 			break;
 		}
@@ -2222,17 +2218,12 @@ DIOCGETSTATES_full:
 		if (pp->addr.addr.type != PF_ADDR_ADDRMASK &&
 		    pp->addr.addr.type != PF_ADDR_DYNIFTL &&
 		    pp->addr.addr.type != PF_ADDR_TABLE) {
-			PF_UNLOCK();
 			error = EINVAL;
 			break;
 		}
-		pa = uma_zalloc(V_pf_pooladdr_z, M_NOWAIT);
-		if (pa == NULL) {
-			PF_UNLOCK();
-			error = ENOMEM;
-			break;
-		}
+		pa = uma_zalloc(V_pf_pooladdr_z, M_WAITOK);
 		bcopy(&pp->addr, pa, sizeof(struct pf_pooladdr));
+		PF_LOCK();
 		if (pa->ifname[0]) {
 			pa->kif = pfi_kif_get(pa->ifname);
 			if (pa->kif == NULL) {