summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Fedorova <sasha@ece.ubc.ca>2016-04-01 12:57:50 -0700
committerSasha Fedorova <sasha@ece.ubc.ca>2016-04-01 12:57:50 -0700
commit303299ffb10567ed4f8d27c971cbdf3fe9d9f84a (patch)
treeac8caf28da766934d758af96a14d9f2678131b6b
parentcb833ba393ce494bec2e6e364d6a09514b213ab2 (diff)
downloadmongo-303299ffb10567ed4f8d27c971cbdf3fe9d9f84a.tar.gz
Added a check for HAVE_POSIX_FADVISE to fix a compilation error on OS X.
-rw-r--r--src/block/block_read.c4
-rw-r--r--src/block/block_write.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/block/block_read.c b/src/block/block_read.c
index 6f0c41c1b5c..8ce1c8dbdaf 100644
--- a/src/block/block_read.c
+++ b/src/block/block_read.c
@@ -40,9 +40,13 @@ __wt_bm_preload(
ret = block->fh->fh_map_preload(session,
block->fh, (uint8_t *)bm->map + offset, size);
else
+#if defined(HAVE_POSIX_FADVISE)
ret = block->fh->fh_advise(session,
block->fh, (wt_off_t)offset,
(wt_off_t)size, POSIX_FADV_WILLNEED);
+#else
+ ret = 0;
+#endif
if (ret == 0)
return (0);
diff --git a/src/block/block_write.c b/src/block/block_write.c
index 134272b52f9..a4e4b39ec50 100644
--- a/src/block/block_write.c
+++ b/src/block/block_write.c
@@ -42,8 +42,10 @@ __wt_block_discard(WT_SESSION_IMPL *session, WT_BLOCK *block, size_t added_size)
return (0);
block->os_cache = 0;
+#if defined(HAVE_POSIX_FADVISE)
WT_ERR(block->fh->fh_advise(session,
block->fh, (wt_off_t)0, (wt_off_t)0, POSIX_FADV_DONTNEED));
+#endif
return (0);
err: /* Ignore ENOTSUP, but don't try again. */