Merge remote-tracking branch 'origin/wip-rbd-readahead'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Conflicts:
	src/client/Fh.h

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge

diff --cc src/client/Fh.h
index 61bf2584de8b1d7d6f724ae07c095543ebf25dc2,a4050a78480cd882659ab97ac8229be0986f6cbc..6f0aebd5d941ab10fe099aaecadce9bc56f154d7
--- 1/src/client/Fh.h
--- 2/src/client/Fh.h
+++ b/src/client/Fh.h
@@@ -19,18 -19,10 +20,14 @@@ struct Fh 
    bool pos_locked;           // pos is currently in use
    list<Cond*> pos_waiters;   // waiters for pos
  
-   // readahead state
-   loff_t last_pos;
-   loff_t consec_read_bytes;
-   int nr_consec_read;
+   Readahead readahead;
  
 +  // file lock
 +  ceph_lock_state_t *fcntl_locks;
 +  ceph_lock_state_t *flock_locks;
 +
    Fh() : inode(0), pos(0), mds(0), mode(0), flags(0), pos_locked(false),
-        last_pos(0), consec_read_bytes(0), nr_consec_read(0),
-        fcntl_locks(NULL), flock_locks(NULL)  {}
 -      readahead() {}
++      readahead(), fcntl_locks(NULL), flock_locks(NULL) {}
  };
  
  

diff --cc src/common/Makefile.am
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/librbd/ImageCtx.cc
Simple merge

diff --cc src/librbd/ImageCtx.h
Simple merge

diff --cc src/librbd/internal.cc
Simple merge

diff --cc src/osdc/ObjectCacher.cc
Simple merge

diff --cc src/osdc/ObjectCacher.h
Simple merge

diff --cc src/test/Makefile.am
Simple merge