On Mon, Sep 15, 2014 at 8:33 PM, Greg KH <[email protected]> wrote:
> On Mon, Sep 15, 2014 at 08:17:47PM +0400, Ilya Dryomov wrote:
>> On Mon, Sep 15, 2014 at 6:30 PM, <[email protected]> wrote:
>> >
>> > The patch below does not apply to the 3.14-stable tree.
>> > If someone wants it applied there, or to any other stable or longterm
>> > tree, then please email the backport, including the original git commit
>> > id to <[email protected]>.
>>
>> Hmm, git cherry-pick 73c3d4812b4c755efeca0140f606f83772a39ce4 on top of
>> both v3.14.18 and v3.14.18 + queue-3.14 works (applies, builds, runs)
>> for me.
>
> Really? It breaks the build here, the issue is in the pr_warning part.
>
>> > diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
>> > index 067d3af2eaf6..61fcfc304f68 100644
>> > --- a/net/ceph/mon_client.c
>> > +++ b/net/ceph/mon_client.c
>> > @@ -1181,7 +1181,15 @@ static struct ceph_msg *mon_alloc_msg(struct
>> > ceph_connection *con,
>> > if (!m) {
>> > pr_info("alloc_msg unknown type %d\n", type);
>> > *skip = 1;
>> > + } else if (front_len > m->front_alloc_len) {
>> > + pr_warning("mon_alloc_msg front %d > prealloc %d
>> > (%u#%llu)\n",
>> > + front_len, m->front_alloc_len,
>> > + (unsigned int)con->peer_name.type,
>> > + le64_to_cpu(con->peer_name.num));
>> > + ceph_msg_put(m);
>> > + m = ceph_msg_new(type, front_len, GFP_NOFS, false);
>> > }
>> > +
>> > return m;
>> > }
>> >
>> >
>
> Ok, odd, I just tried it again, and it worked. Must be going crazy
> here, sorry for the noise.
>
> Oh, what about 3.10?
Sorry, turns out 3.10 depends on the following:
3cea4c3071d4e55e9d7356efe9d0ebf92f0c2204
libceph: rename ceph_msg::front_max to front_alloc_len
Should I squash and send a backport or you'll just apply it separately?
Thanks,
Ilya
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
