Merge pull request #3166 from ceph/wip-librados-fadvise

fadvise for librados, librbd + osd guts

    sage-2014-12-16_06:27:10-rados:singleton-wip-sage-testing2-distro-basic-multi
    sage-2014-12-15_13:18:23-rados:thrash-wip-sage-testing2-distro-basic-multi

diff --cc src/os/FileStore.cc
Simple merge

diff --cc src/os/FileStore.h
Simple merge

diff --cc src/osd/ReplicatedBackend.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/test/librbd/test_librbd.cc
index 1a43e7c132a0cf5486ef0d444e22bd0de6819701,ccbb1885fc604df98b8d814fdcf6e8e314fe3bdb..a5ff8acc437aef2a75c7a0391d9037492703f672
--- 1/src/test/librbd/test_librbd.cc
--- 2/src/test/librbd/test_librbd.cc
+++ b/src/test/librbd/test_librbd.cc
@@@ -906,16 -1005,14 +1005,19 @@@ void read_test_data(librbd::Image& imag
    int read, total_read = 0;
    size_t len = expected_len;
    ceph::bufferlist bl;
-   read = image.read(off + total_read, len, bl);
+   if (iohint)
+     read = image.read2(off + total_read, len, bl, iohint);
+   else
+     read = image.read(off + total_read, len, bl);
    ASSERT_TRUE(read >= 0);
 +  std::string bl_str(bl.c_str(), read);
 +
    printf("read: %u\n", (unsigned int) read);
 -  printf("read: %s\nexpected: %s\n", bl.c_str(), expected);
 -  ASSERT_EQ(0, memcmp(bl.c_str(), expected, expected_len));
 +  int result = memcmp(bl_str.c_str(), expected, expected_len);
 +  if (result != 0) {
 +    printf("read: %s\nexpected: %s\n", bl_str.c_str(), expected);
 +    ASSERT_EQ(0, result);
 +  }
    *passed = true;
  }