| Message ID | 1455986729-12544-5-git-send-email-idryomov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/20/2016 10:45 AM, Ilya Dryomov wrote: > Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Please just reorder your patches and squash this in with your [2/4] patch. -Alex > --- > net/ceph/messenger.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c > index dd7c1b7f932b..43edf897c9eb 100644 > --- a/net/ceph/messenger.c > +++ b/net/ceph/messenger.c > @@ -3085,10 +3085,7 @@ void ceph_msg_revoke(struct ceph_msg *msg) > con->out_skip += con_out_kvec_skip(con); > } else { > BUG_ON(!msg->data_length); > - if (con->peer_features & CEPH_FEATURE_MSG_AUTH) > - con->out_skip += sizeof(msg->footer); > - else > - con->out_skip += sizeof(msg->old_footer); > + con->out_skip += sizeof_footer(con); > } > /* data, middle, front */ > if (msg->data_length) > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Feb 20, 2016 at 7:47 PM, Alex Elder <elder@ieee.org> wrote: > On 02/20/2016 10:45 AM, Ilya Dryomov wrote: >> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> > > Please just reorder your patches and squash this in with > your [2/4] patch. Can't do - this code in ceph_msg_revoke() is new in 4.5, while 2/4 needs to be backported. Thanks, Ilya -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/20/2016 10:45 AM, Ilya Dryomov wrote: > Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Looks good. Reviewed-by: Alex Elder <elder@linaro.org> > --- > net/ceph/messenger.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c > index dd7c1b7f932b..43edf897c9eb 100644 > --- a/net/ceph/messenger.c > +++ b/net/ceph/messenger.c > @@ -3085,10 +3085,7 @@ void ceph_msg_revoke(struct ceph_msg *msg) > con->out_skip += con_out_kvec_skip(con); > } else { > BUG_ON(!msg->data_length); > - if (con->peer_features & CEPH_FEATURE_MSG_AUTH) > - con->out_skip += sizeof(msg->footer); > - else > - con->out_skip += sizeof(msg->old_footer); > + con->out_skip += sizeof_footer(con); > } > /* data, middle, front */ > if (msg->data_length) > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index dd7c1b7f932b..43edf897c9eb 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -3085,10 +3085,7 @@ void ceph_msg_revoke(struct ceph_msg *msg) con->out_skip += con_out_kvec_skip(con); } else { BUG_ON(!msg->data_length); - if (con->peer_features & CEPH_FEATURE_MSG_AUTH) - con->out_skip += sizeof(msg->footer); - else - con->out_skip += sizeof(msg->old_footer); + con->out_skip += sizeof_footer(con); } /* data, middle, front */ if (msg->data_length)
Signed-off-by: Ilya Dryomov <idryomov@gmail.com> --- net/ceph/messenger.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)