diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-30 06:58:58 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-30 06:58:58 +0400 |
| commit | 92bb062fe36132a04c6dc8b3c51c945730b05224 (patch) | |
| tree | fbce384d5ac6ced74a009b1b8eb212bc1696112b /net/ceph/messenger.c | |
| parent | 7409b7132ca96d01b373541d788e8c5893bec1f3 (diff) | |
| parent | 8adc8b3d780363d5df0dd6ace10336e3d7e331a1 (diff) | |
| download | linux-92bb062fe36132a04c6dc8b3c51c945730b05224.tar.xz | |
Merge branch 'for-linus' of git://github.com/NewDreamNetwork/ceph-client
* 'for-linus' of git://github.com/NewDreamNetwork/ceph-client:
libceph: fix pg_temp mapping update
libceph: fix pg_temp mapping calculation
libceph: fix linger request requeuing
libceph: fix parse options memory leak
libceph: initialize ack_stamp to avoid unnecessary connection reset
Diffstat (limited to 'net/ceph/messenger.c')
| -rw-r--r-- | net/ceph/messenger.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index c340e2e0765b..9918e9eb276e 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2307,6 +2307,7 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags) m->front_max = front_len; m->front_is_vmalloc = false; m->more_to_follow = false; + m->ack_stamp = 0; m->pool = NULL; /* middle */ |