From: Josh Durgin <josh.durgin@inktank.com>
Date: Thu, 16 Oct 2014 21:33:42 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/wip-rbd-readahead'
X-Git-Tag: v0.88~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9f302da08ab96128b28d85e2f566ad0f2ba2f30;p=ceph.git

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

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Conflicts:
	src/client/Fh.h
---

a9f302da08ab96128b28d85e2f566ad0f2ba2f30
diff --cc src/client/Fh.h
index 61bf2584de8,a4050a78480..6f0aebd5d94
--- a/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) {}
  };