summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2013-03-12 08:59:51 +0000
committerglebius <glebius@FreeBSD.org>2013-03-12 08:59:51 +0000
commitce7d7c6757e990121e86f438ac5aa60b8f718687 (patch)
treef34eba5ca48dacca02009b35d1f3606f9fc96750 /sys/fs
parentcd3470bcd6863c637963850bb25371cf831a20e1 (diff)
downloadFreeBSD-src-ce7d7c6757e990121e86f438ac5aa60b8f718687.zip
FreeBSD-src-ce7d7c6757e990121e86f438ac5aa60b8f718687.tar.gz
Finish r243882: mechanically substitute flags from historic mbuf
allocator with malloc(9) flags within sys. Sponsored by: Nginx, Inc.
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/nfs/nfsport.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h
index ea04525..2817223 100644
--- a/sys/fs/nfs/nfsport.h
+++ b/sys/fs/nfs/nfsport.h
@@ -140,32 +140,32 @@
* Allocate mbufs. Must succeed and never set the mbuf ptr to NULL.
*/
#define NFSMGET(m) do { \
- MGET((m), M_TRYWAIT, MT_DATA); \
+ MGET((m), M_WAITOK, MT_DATA); \
while ((m) == NULL ) { \
(void) nfs_catnap(PZERO, 0, "nfsmget"); \
- MGET((m), M_TRYWAIT, MT_DATA); \
+ MGET((m), M_WAITOK, MT_DATA); \
} \
} while (0)
#define NFSMGETHDR(m) do { \
- MGETHDR((m), M_TRYWAIT, MT_DATA); \
+ MGETHDR((m), M_WAITOK, MT_DATA); \
while ((m) == NULL ) { \
(void) nfs_catnap(PZERO, 0, "nfsmget"); \
- MGETHDR((m), M_TRYWAIT, MT_DATA); \
+ MGETHDR((m), M_WAITOK, MT_DATA); \
} \
} while (0)
#define NFSMCLGET(m, w) do { \
- MGET((m), M_TRYWAIT, MT_DATA); \
+ MGET((m), M_WAITOK, MT_DATA); \
while ((m) == NULL ) { \
(void) nfs_catnap(PZERO, 0, "nfsmget"); \
- MGET((m), M_TRYWAIT, MT_DATA); \
+ MGET((m), M_WAITOK, MT_DATA); \
} \
MCLGET((m), (w)); \
} while (0)
#define NFSMCLGETHDR(m, w) do { \
- MGETHDR((m), M_TRYWAIT, MT_DATA); \
+ MGETHDR((m), M_WAITOK, MT_DATA); \
while ((m) == NULL ) { \
(void) nfs_catnap(PZERO, 0, "nfsmget"); \
- MGETHDR((m), M_TRYWAIT, MT_DATA); \
+ MGETHDR((m), M_WAITOK, MT_DATA); \
} \
} while (0)
#define NFSMTOD mtod
OpenPOWER on IntegriCloud