From owner-svn-src-head@FreeBSD.ORG Sat Oct 2 17:58:58 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41F5A106564A; Sat, 2 Oct 2010 17:58:58 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 16ADA8FC17; Sat, 2 Oct 2010 17:58:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o92HwvSh046940; Sat, 2 Oct 2010 17:58:57 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o92HwvnH046936; Sat, 2 Oct 2010 17:58:57 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201010021758.o92HwvnH046936@svn.freebsd.org> From: Alan Cox Date: Sat, 2 Oct 2010 17:58:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213363 - in head/sys: fs/nwfs fs/smbfs ufs/ffs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Oct 2010 17:58:58 -0000 Author: alc Date: Sat Oct 2 17:58:57 2010 New Revision: 213363 URL: http://svn.freebsd.org/changeset/base/213363 Log: M_USE_RESERVE has been deprecated for a decade. Eliminate any uses that have no run-time effect. Modified: head/sys/fs/nwfs/nwfs_vfsops.c head/sys/fs/smbfs/smbfs_vfsops.c head/sys/ufs/ffs/ffs_softdep.c Modified: head/sys/fs/nwfs/nwfs_vfsops.c ============================================================================== --- head/sys/fs/nwfs/nwfs_vfsops.c Sat Oct 2 17:41:47 2010 (r213362) +++ head/sys/fs/nwfs/nwfs_vfsops.c Sat Oct 2 17:58:57 2010 (r213363) @@ -186,8 +186,7 @@ static int nwfs_mount(struct mount *mp) ncp_conn_unlock(conn, td); /* we keep the ref */ mp->mnt_stat.f_iosize = conn->buffer_size; /* We must malloc our own mount info */ - nmp = malloc(sizeof(struct nwmount),M_NWFSDATA, - M_WAITOK | M_USE_RESERVE | M_ZERO); + nmp = malloc(sizeof(struct nwmount), M_NWFSDATA, M_WAITOK | M_ZERO); if (nmp == NULL) { nwfs_printf("could not alloc nwmount\n"); error = ENOMEM; Modified: head/sys/fs/smbfs/smbfs_vfsops.c ============================================================================== --- head/sys/fs/smbfs/smbfs_vfsops.c Sat Oct 2 17:41:47 2010 (r213362) +++ head/sys/fs/smbfs/smbfs_vfsops.c Sat Oct 2 17:58:57 2010 (r213363) @@ -175,8 +175,7 @@ smbfs_mount(struct mount *mp) #ifdef SMBFS_USEZONE smp = zalloc(smbfsmount_zone); #else - smp = malloc(sizeof(*smp), M_SMBFSDATA, - M_WAITOK|M_USE_RESERVE); + smp = malloc(sizeof(*smp), M_SMBFSDATA, M_WAITOK); #endif if (smp == NULL) { printf("could not alloc smbmount\n"); Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Sat Oct 2 17:41:47 2010 (r213362) +++ head/sys/ufs/ffs/ffs_softdep.c Sat Oct 2 17:58:57 2010 (r213363) @@ -580,7 +580,7 @@ softdep_get_depcounts(struct mount *mp, * this file is being ported. */ -#define M_SOFTDEP_FLAGS (M_WAITOK | M_USE_RESERVE) +#define M_SOFTDEP_FLAGS (M_WAITOK) #define D_PAGEDEP 0 #define D_INODEDEP 1