← Back to branch summary

~james-page/ubuntu/vivid/ceph/0.93

« back to all changes in this revision

Viewing changes to debian/patches/client-sleep2.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-07-30 10:15:40 UTC
  • mfrom: (0.1.29 sid)
  • Revision ID: package-import@ubuntu.com-20140730101540-b7gsn9jqkye4a5ty
Tags: 0.80.5-1
* New upstream stable release:
  - d/p/firefly-post-release.patch: Dropped, no longer required.
  - d/lib{rados2,cephfs1}.symbols: Update with new symbols.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/client-sleep2.patch
10
10
 
11
11
--- a/src/client/Client.cc
12
12
+++ b/src/client/Client.cc
13
 
@@ -2351,8 +2351,11 @@
14
 
 
 
13
@@ -2352,6 +2352,9 @@ void Client::put_cap_ref(Inode *in, int
15
14
 int Client::get_caps(Inode *in, int need, int want, int *phave, loff_t endoff)
16
15
 {
17
16
   while (1) {
21
20
     if (endoff > 0 &&
22
21
        (endoff >= (loff_t)in->max_size ||
23
22
         endoff > (loff_t)(in->size << 1)) &&
24
 
        endoff > (loff_t)in->wanted_max_size) {
25
 
@@ -3082,11 +3085,15 @@
26
 
   while (s->caps.size()) {
 
23
@@ -3083,9 +3086,13 @@ void Client::remove_session_caps(MetaSes
27
24
     Cap *cap = *s->caps.begin();
28
25
     Inode *in = cap->inode;
29
26
     int dirty_caps = 0;
38
35
     if (dirty_caps) {
39
36
       lderr(cct) << "remove_session_caps still has dirty|flushing caps on " << *in << dendl;
40
37
       if (in->flushing_caps)
41
 
        num_flushing_caps--;