diff options
| author | Alan Cox <alc@FreeBSD.org> | 2010-10-02 17:58:57 +0000 |
|---|---|---|
| committer | Alan Cox <alc@FreeBSD.org> | 2010-10-02 17:58:57 +0000 |
| commit | a03e344a7fbc52b843ac362b6d1929bde4947a9a (patch) | |
| tree | 231038e49d85b5a1dad38d0e85bc2f354c7c0c06 /sys | |
| parent | 915d4d4a1790671e48173ffa6980cfede0b8df2c (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/fs/nwfs/nwfs_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/fs/smbfs/smbfs_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c index 497414ed7146e..c20159f5cd8e6 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 16352d7a31f18..ac0c5e729c436 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 475367dd6698e..ca4ea0b11d51e 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 |