This patch looks like it should be in the 3.9-stable tree, should we apply
it?
------------------
From: "Philipp Reisner <[email protected]>"
commit ef57f9e6bb9278720c8a5278728f252ab85d7ac6 upstream
Signed-off-by: Philipp Reisner <[email protected]>
Signed-off-by: Lars Ellenberg <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
Signed-off-by: Jonghwan Choi <[email protected]>
---
drivers/block/drbd/drbd_receiver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/drbd/drbd_receiver.c
b/drivers/block/drbd/drbd_receiver.c
index 5105f43..2f5fffd 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4658,8 +4658,8 @@ static int drbd_do_features(struct drbd_tconn *tconn)
#if !defined(CONFIG_CRYPTO_HMAC) && !defined(CONFIG_CRYPTO_HMAC_MODULE)
static int drbd_do_auth(struct drbd_tconn *tconn)
{
- dev_err(DEV, "This kernel was build without CONFIG_CRYPTO_HMAC.\n");
- dev_err(DEV, "You need to disable 'cram-hmac-alg' in drbd.conf.\n");
+ conn_err(tconn, "This kernel was build without
CONFIG_CRYPTO_HMAC.\n");
+ conn_err(tconn, "You need to disable 'cram-hmac-alg' in
drbd.conf.\n");
return -1;
}
#else
--
Yes, please.
> This patch looks like it should be in the 3.9-stable tree, should we apply
> it?
>
> ------------------
>
> From: "Philipp Reisner <[email protected]>"
>
> commit ef57f9e6bb9278720c8a5278728f252ab85d7ac6 upstream
>
> Signed-off-by: Philipp Reisner <[email protected]>
> Signed-off-by: Lars Ellenberg <[email protected]>
> Signed-off-by: Jens Axboe <[email protected]>
> Signed-off-by: Jonghwan Choi <[email protected]>
> ---
> drivers/block/drbd/drbd_receiver.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/drbd/drbd_receiver.c
> b/drivers/block/drbd/drbd_receiver.c
> index 5105f43..2f5fffd 100644
> --- a/drivers/block/drbd/drbd_receiver.c
> +++ b/drivers/block/drbd/drbd_receiver.c
> @@ -4658,8 +4658,8 @@ static int drbd_do_features(struct drbd_tconn *tconn)
> #if !defined(CONFIG_CRYPTO_HMAC) && !defined(CONFIG_CRYPTO_HMAC_MODULE)
> static int drbd_do_auth(struct drbd_tconn *tconn)
> {
> - dev_err(DEV, "This kernel was build without CONFIG_CRYPTO_HMAC.\n");
> - dev_err(DEV, "You need to disable 'cram-hmac-alg' in drbd.conf.\n");
> + conn_err(tconn, "This kernel was build without
> CONFIG_CRYPTO_HMAC.\n");
> + conn_err(tconn, "You need to disable 'cram-hmac-alg' in
> drbd.conf.\n");
> return -1;
> }
> #else
> --
On Thu, May 09, 2013 at 08:06:15AM +0900, Jonghwan Choi wrote:
> This patch looks like it should be in the 3.9-stable tree, should we apply
> it?
This seems to be applicable to older kernels as well (starting with
3.0 at least).
I'm queuing it for 3.5.
Cheers,
--
Luis
>
> ------------------
>
> From: "Philipp Reisner <[email protected]>"
>
> commit ef57f9e6bb9278720c8a5278728f252ab85d7ac6 upstream
>
> Signed-off-by: Philipp Reisner <[email protected]>
> Signed-off-by: Lars Ellenberg <[email protected]>
> Signed-off-by: Jens Axboe <[email protected]>
> Signed-off-by: Jonghwan Choi <[email protected]>
> ---
> drivers/block/drbd/drbd_receiver.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/drbd/drbd_receiver.c
> b/drivers/block/drbd/drbd_receiver.c
> index 5105f43..2f5fffd 100644
> --- a/drivers/block/drbd/drbd_receiver.c
> +++ b/drivers/block/drbd/drbd_receiver.c
> @@ -4658,8 +4658,8 @@ static int drbd_do_features(struct drbd_tconn *tconn)
> #if !defined(CONFIG_CRYPTO_HMAC) && !defined(CONFIG_CRYPTO_HMAC_MODULE)
> static int drbd_do_auth(struct drbd_tconn *tconn)
> {
> - dev_err(DEV, "This kernel was build without CONFIG_CRYPTO_HMAC.\n");
> - dev_err(DEV, "You need to disable 'cram-hmac-alg' in drbd.conf.\n");
> + conn_err(tconn, "This kernel was build without
> CONFIG_CRYPTO_HMAC.\n");
> + conn_err(tconn, "You need to disable 'cram-hmac-alg' in
> drbd.conf.\n");
> return -1;
> }
> #else
> --
>
> --
> 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
On Tue, May 14, 2013 at 01:56:40PM +0100, Luis Henriques wrote:
> On Thu, May 09, 2013 at 08:06:15AM +0900, Jonghwan Choi wrote:
> > This patch looks like it should be in the 3.9-stable tree, should we apply
> > it?
>
> This seems to be applicable to older kernels as well (starting with
> 3.0 at least).
>
> I'm queuing it for 3.5.
Uhm no?
There is no struct drbd_tconn and no conn_err before 3.8.
So yes, if you want to queue that for 3.8.y, do so.
Before that this commit is not applicable.
Lars
>
> Cheers,
> --
> Luis
>
>
> >
> > ------------------
> >
> > From: "Philipp Reisner <[email protected]>"
> >
> > commit ef57f9e6bb9278720c8a5278728f252ab85d7ac6 upstream
> >
> > Signed-off-by: Philipp Reisner <[email protected]>
> > Signed-off-by: Lars Ellenberg <[email protected]>
> > Signed-off-by: Jens Axboe <[email protected]>
> > Signed-off-by: Jonghwan Choi <[email protected]>
> > ---
> > drivers/block/drbd/drbd_receiver.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/block/drbd/drbd_receiver.c
> > b/drivers/block/drbd/drbd_receiver.c
> > index 5105f43..2f5fffd 100644
> > --- a/drivers/block/drbd/drbd_receiver.c
> > +++ b/drivers/block/drbd/drbd_receiver.c
> > @@ -4658,8 +4658,8 @@ static int drbd_do_features(struct drbd_tconn *tconn)
> > #if !defined(CONFIG_CRYPTO_HMAC) && !defined(CONFIG_CRYPTO_HMAC_MODULE)
> > static int drbd_do_auth(struct drbd_tconn *tconn)
> > {
> > - dev_err(DEV, "This kernel was build without CONFIG_CRYPTO_HMAC.\n");
> > - dev_err(DEV, "You need to disable 'cram-hmac-alg' in drbd.conf.\n");
> > + conn_err(tconn, "This kernel was build without
> > CONFIG_CRYPTO_HMAC.\n");
> > + conn_err(tconn, "You need to disable 'cram-hmac-alg' in
> > drbd.conf.\n");
> > return -1;
> > }
> > #else
> > --
On Tue, May 14, 2013 at 03:22:27PM +0200, 'Lars Ellenberg' wrote:
> On Tue, May 14, 2013 at 01:56:40PM +0100, Luis Henriques wrote:
> > On Thu, May 09, 2013 at 08:06:15AM +0900, Jonghwan Choi wrote:
> > > This patch looks like it should be in the 3.9-stable tree, should we apply
> > > it?
> >
> > This seems to be applicable to older kernels as well (starting with
> > 3.0 at least).
> >
> > I'm queuing it for 3.5.
>
> Uhm no?
> There is no struct drbd_tconn and no conn_err before 3.8.
Yeah, I've realised that too late.
Sorry for the noise, and thanks for catching that.
Cheers,
--
Luis
>
> So yes, if you want to queue that for 3.8.y, do so. Before that
> this commit is not applicable.
>
> Lars
>
> >
> > Cheers,
> > --
> > Luis
> >
> >
> > >
> > > ------------------
> > >
> > > From: "Philipp Reisner <[email protected]>"
> > >
> > > commit ef57f9e6bb9278720c8a5278728f252ab85d7ac6 upstream
> > >
> > > Signed-off-by: Philipp Reisner <[email protected]>
> > > Signed-off-by: Lars Ellenberg <[email protected]>
> > > Signed-off-by: Jens Axboe <[email protected]>
> > > Signed-off-by: Jonghwan Choi <[email protected]>
> > > ---
> > > drivers/block/drbd/drbd_receiver.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/block/drbd/drbd_receiver.c
> > > b/drivers/block/drbd/drbd_receiver.c
> > > index 5105f43..2f5fffd 100644
> > > --- a/drivers/block/drbd/drbd_receiver.c
> > > +++ b/drivers/block/drbd/drbd_receiver.c
> > > @@ -4658,8 +4658,8 @@ static int drbd_do_features(struct drbd_tconn *tconn)
> > > #if !defined(CONFIG_CRYPTO_HMAC) && !defined(CONFIG_CRYPTO_HMAC_MODULE)
> > > static int drbd_do_auth(struct drbd_tconn *tconn)
> > > {
> > > - dev_err(DEV, "This kernel was build without CONFIG_CRYPTO_HMAC.\n");
> > > - dev_err(DEV, "You need to disable 'cram-hmac-alg' in drbd.conf.\n");
> > > + conn_err(tconn, "This kernel was build without
> > > CONFIG_CRYPTO_HMAC.\n");
> > > + conn_err(tconn, "You need to disable 'cram-hmac-alg' in
> > > drbd.conf.\n");
> > > return -1;
> > > }
> > > #else
> > > --