diff options
author | Arnd Bergmann | 2011-10-20 15:30:55 +0200 |
---|---|---|
committer | Arnd Bergmann | 2011-10-20 15:30:55 +0200 |
commit | 29ea35969b92a4be122a58c4aceea8c5e2c388d9 (patch) | |
tree | 8285c0e98e7bb03868d390b58180e3cab876a8db /net/ceph/messenger.c | |
parent | 112d17d6f75b93e1dcaec2e2232a411148b3bf71 (diff) | |
parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) |
Merge branch 'imx/devel' into next/devel
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 */ |