From e9dc33bfce177d81402bea81ce874ef0bb9f3536 Mon Sep 17 00:00:00 2001 From: alc Date: Sat, 2 Oct 2010 17:58:57 +0000 Subject: M_USE_RESERVE has been deprecated for a decade. Eliminate any uses that have no run-time effect. --- sys/fs/nwfs/nwfs_vfsops.c | 3 +-- sys/fs/smbfs/smbfs_vfsops.c | 3 +-- sys/ufs/ffs/ffs_softdep.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'sys') diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c index 497414e..c20159f 100644 --- a/sys/fs/nwfs/nwfs_vfsops.c +++ b/sys/fs/nwfs/nwfs_vfsops.c @@ -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; diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c index 16352d7..ac0c5e7 100644 --- a/sys/fs/smbfs/smbfs_vfsops.c +++ b/sys/fs/smbfs/smbfs_vfsops.c @@ -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"); diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 475367dd..ca4ea0b 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -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 -- cgit v1.1