[Drbd-dev] [PATCH 09/10] drbd: Remove volume numbers from struct p_header95

[Philipp Reisner]

Am Freitag, 23. September 2011, 19:28:24 schrieb Kyle Moffett:
> Hi!
> 
> On Fri, Sep 23, 2011 at 10:31, Philipp Reisner
> 
> <philipp.reisner at linbit.com> wrote:
> > From: Andreas Gruenbacher <agruen at linbit.com>
> > 
> > Signed-off-by: Philipp Reisner <philipp.reisner at linbit.com>
> > Signed-off-by: Lars Ellenberg <lars.ellenberg at linbit.com>
> > ---
> 
> [...snip...]
> 
> > diff --git a/drivers/block/drbd/drbd_main.c
> > b/drivers/block/drbd/drbd_main.c index 3310986..99b467e 100644
> > --- a/drivers/block/drbd/drbd_main.c
> > +++ b/drivers/block/drbd/drbd_main.c
> > @@ -717,11 +717,11 @@ static unsigned int prepare_header80(struct
> > p_header80 *h, enum drbd_packet cmd, return sizeof(struct p_header80);
> >  }
> > 
> > -static unsigned int prepare_header95(struct p_header95 *h, enum
> > drbd_packet cmd, int size, int vnr) +static unsigned int
> > prepare_header95(struct p_header95 *h, enum drbd_packet cmd, int size) {
> >        h->magic   = cpu_to_be16(DRBD_MAGIC_BIG);
> >        h->command = cpu_to_be16(cmd);
> > -       h->vol_n_len = cpu_to_be32(vnr << 24 | size);
> > +       h->length = cpu_to_be32(size);
> >        return sizeof(struct p_header95);
> >  }
> 
> This patch needs a commit message indicating why it does not break
> compatibility.  If you are guaranteed that the "vnr" passed into
> prepare_header95 is always zero, then you should indicate why that is
> true.
> 

Here is the commit message for that one. The alternative is to merge
that to patch 'drbd: Use new header layout, and send volume IOs'.
( Which is patch number 236, i.e. outside of this (10th) posting of
  DRBD-8.4 patches. It was posted on August 25.
  See https://lkml.org/lkml/2011/8/25/322 )

Author: Andreas Gruenbacher <agruen at linbit.com>
Date:   Tue Mar 22 13:17:47 2011 +0100

    drbd: Remove volume numbers from struct p_header95
    
    Remove the temporal 8 bit volume number form header 95. All connections
    that support multiple volumes are new using protocol 100 with header 100.
    
    Signed-off-by: Philipp Reisner <philipp.reisner at linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg at linbit.com>

Best,
 Phil
-- 
: Dipl-Ing Philipp Reisner
: LINBIT | Your Way to High Availability
: Tel: +43-1-8178292-50, Fax: +43-1-8178292-82
: http://www.linbit.com

DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria.