svn commit: r213363 - in head/sys: fs/nwfs fs/smbfs ufs/ffs
Alan Cox
alc at FreeBSD.org
Sat Oct 2 17:58:58 UTC 2010
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
More information about the svn-src-all
mailing list