Date: Wed, 9 Nov 2016 16:32:09 +0100
From: Lars Ellenberg <lars.ellenberg@linbit.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Richard Weinberger <richard@nod.at>, wolfgang.glas@iteg.at,
        christoph.lechleitner@iteg.at, philipp.reisner@linbit.com,
        stable@vger.kernel.org, linux-kernel@vger.kernel.org,
        viro@zeniv.linux.org.uk, drbd-dev@lists.linbit.com
Subject: Re: [PATCH] drbd: Fix kernel_sendmsg() usage
Message-ID: <20161109153209.GK1382@soda.linbit>
Mail-Followup-To: Jens Axboe <axboe@kernel.dk>,
        Richard Weinberger <richard@nod.at>, wolfgang.glas@iteg.at,
        christoph.lechleitner@iteg.at, philipp.reisner@linbit.com,
        stable@vger.kernel.org, linux-kernel@vger.kernel.org,
        viro@zeniv.linux.org.uk, drbd-dev@lists.linbit.com
References: <1478601789-15060-1-git-send-email-richard@nod.at>
 <1478601789-15060-1-git-send-email-richard@nod.at>
 <497abc52-093f-17ea-5fb5-645030a23a01@nod.at>
 <20161108165204.GC2834@kernel.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <20161108165204.GC2834@kernel.dk>
User-Agent: Mutt/1.5.24 (2015-08-30)
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1968
Lines: 46

On Tue, Nov 08, 2016 at 09:52:04AM -0700, Jens Axboe wrote:
> > > This should go into 4.9,
> > > and into all stable branches since and including v4.0,
> > > which is the first to contain the exposing change.
> > > 
> > > It is correct for all stable branches older than that as well
> > > (which contain the DRBD driver; which is 2.6.33 and up).
> > > 
> > > It requires a small "conflict" resolution for v4.4 and earlier, with v4.5
> > > we dropped the comment block immediately preceding the kernel_sendmsg().
> > > 
> > > Cc: stable@vger.kernel.org
> > > Cc: viro@zeniv.linux.org.uk
> > > Cc: christoph.lechleitner@iteg.at
> > > Cc: wolfgang.glas@iteg.at
> > > Reported-by: Christoph Lechleitner <christoph.lechleitner@iteg.at>
> > > Tested-by: Christoph Lechleitner <christoph.lechleitner@iteg.at>
> > > Signed-off-by: Richard Weinberger <richard@nod.at>
> > > Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
> > 
> > Changing my patch is perfectly fine, but please clearly state it.
> > I.e. by adding something like that before your S-o-b.
> > [Lars: Massaged patch to match my personal taste...]
> 

> Lars, are you sending a new one? If you do, add the stable tag as well.

So my "change" against his original patch was
- rv = kernel_sendmsg(sock, &msg, &iov, 1, size - sent);
+ rv = kernel_sendmsg(sock, &msg, &iov, 1, iov.iov_len);
to make it "more obviously correct" from looking just at the one line
without even having to read the context.  And a more verbose commit message.

If that requires yet additional noise, sure, so be it :)

Should I sent two patches, one that applies to 4.5 and later,
and one that applies to 2.6.33 ... 4.4, or are you or stable
willing to resolve the trivial "missing comment block" conflict yourself?

-- 
: Lars Ellenberg
: LINBIT | Keeping the Digital World Running
: DRBD -- Heartbeat -- Corosync -- Pacemaker
: R&D, Integration, Ops, Consulting, Support

DRBD? and LINBIT? are registered trademarks of LINBIT