diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-05 10:43:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-05 10:43:22 -0800 |
| commit | fb62c00a6d8942775abc23d1621db1252e2d93d1 (patch) | |
| tree | ef8760123f5a2b692126ecb7a70f2689053885c1 /include | |
| parent | 5c4b4be3b6b937256103a5ae49177e0c3a17cb8f (diff) | |
| parent | 455cec0abff563574cca432ced49f734117ca113 (diff) | |
| download | linux-fb62c00a6d8942775abc23d1621db1252e2d93d1.tar.gz linux-fb62c00a6d8942775abc23d1621db1252e2d93d1.tar.bz2 linux-fb62c00a6d8942775abc23d1621db1252e2d93d1.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: no .snap inside of snapped namespace
libceph: fix msgr standby handling
libceph: fix msgr keepalive flag
libceph: fix msgr backoff
libceph: retry after authorization failure
libceph: fix handling of short returns from get_user_pages
ceph: do not clear I_COMPLETE from d_release
ceph: do not set I_COMPLETE
Revert "ceph: keep reference to parent inode on ceph_dentry"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ceph/messenger.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index c3011beac30d..31d91a64838b 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h @@ -123,6 +123,7 @@ struct ceph_msg_pos { #define SOCK_CLOSED 11 /* socket state changed to closed */ #define OPENING 13 /* open connection w/ (possibly new) peer */ #define DEAD 14 /* dead, about to kfree */ +#define BACKOFF 15 /* * A single connection with another host. @@ -160,7 +161,6 @@ struct ceph_connection { struct list_head out_queue; struct list_head out_sent; /* sending or sent but unacked */ u64 out_seq; /* last message queued for send */ - bool out_keepalive_pending; u64 in_seq, in_seq_acked; /* last message received, acked */ |