[KARMIC] UBUNTU: Update the dm-raid45 module to latest version

[Andy Whitcroft]

On Wed, Jul 01, 2009 at 03:41:18PM +0200, Stefan Bader wrote:
> Manoj Iyer wrote:
> > Mail system is bouncing my mail coz the patch is too big, so including 
> > only request pull. If the moderator can clear my prev email, that one has 
> > the patch attached.
> > 
> > I updated the dm-raid45 files under ubuntu/, the module is now built as a 
> > single .ko, I tested the kernel on an AMD64 box, the dm-raid45 module
> > loads fine. I am unable to test to see if it actaully works. Here is the 
> > load test:
> > 
> > manjo at sleepy:~$ uname -r
> > 2.6.31-1-generic
> > 
> > manjo at sleepy:~$ sudo modprobe dm-raid45
> > manjo at sleepy:~$ lsmod
> > Module                  Size  Used by
> > dm_raid45              15104  0
> > 
> > 
> > The following changes since commit 
> > 662f64ad194439c2f3b7b01238c372c782dffb08:
> >    Andy Whitcroft (1):
> >          UBUNTU: remove leftovers of gfs
> > 
> > are available in the git repository at:
> > 
> >    git://kernel.ubuntu.com/manjo/ubuntu-karmic.git dmraid45
> > 
> > Manoj Iyer (1):
> >        UBUNTU: Update the dm-raid45 module to latest version
> > 
> >   ubuntu/Makefile                                    |    2 +-
> >   ubuntu/dm-raid4-5/BOM                              |    2 +-
> >   ubuntu/dm-raid4-5/Makefile                         |    3 +-
> >   .../dm-raid4-5/{dm-mem-cache.c => dm-memcache.c}   |   79 +-
> >   .../dm-raid4-5/{dm-mem-cache.h => dm-memcache.h}   |   37 +-
> >   ubuntu/dm-raid4-5/dm-message.c                     |   13 +-
> >   ubuntu/dm-raid4-5/dm-message.h                     |    6 +-
> >   ubuntu/dm-raid4-5/dm-raid4-5.c                     | 4425 
> > -------------------
> >   ubuntu/dm-raid4-5/dm-raid4-5.h                     |   27 -
> >   ubuntu/dm-raid4-5/dm-raid45.c                      | 4547 
> > ++++++++++++++++++++
> >   ubuntu/dm-raid4-5/dm-raid45.h                      |   28 +
> >   ubuntu/dm-raid4-5/dm-region-hash.c                 |  718 +++
> >   ubuntu/dm-raid4-5/dm-region-hash.h                 |  108 +
> >   ubuntu/dm-raid4-5/dm-region_hash.c                 |  643 ---
> >   ubuntu/dm-raid4-5/dm-region_hash.h                 |   75 -
> >   15 files changed, 5485 insertions(+), 5228 deletions(-)
> >   rename ubuntu/dm-raid4-5/{dm-mem-cache.c => dm-memcache.c} (78%)
> >   rename ubuntu/dm-raid4-5/{dm-mem-cache.h => dm-memcache.h} (50%)
> >   delete mode 100644 ubuntu/dm-raid4-5/dm-raid4-5.c
> >   delete mode 100644 ubuntu/dm-raid4-5/dm-raid4-5.h
> >   create mode 100644 ubuntu/dm-raid4-5/dm-raid45.c
> >   create mode 100644 ubuntu/dm-raid4-5/dm-raid45.h
> >   create mode 100644 ubuntu/dm-raid4-5/dm-region-hash.c
> >   create mode 100644 ubuntu/dm-raid4-5/dm-region-hash.h
> >   delete mode 100644 ubuntu/dm-raid4-5/dm-region_hash.c
> >   delete mode 100644 ubuntu/dm-raid4-5/dm-region_hash.h
> > 
> > 
> > Cheers
> > --- manjo
> > 
> Three things that I saw, two of them rather formal
> 
> 1. On the commit message, rather that having Mask: there empty, just delete the 
> whole line
> 2. I would also use the full version in the BOM file (with the 2.6.30-rc3)
> 3. That one I am not completely sure, but I thought that you would need to 
> repeat the complete object list on the -objs line.
> 
> So this:
> -obj-$(CONFIG_DM_RAID45) += dm-raid4-5.o dm-mem-cache.o dm-region_hash.o 
> dm-message.o
> +obj-$(CONFIG_DM_RAID45) := dm-raid45.o
> +dm-raid45-objs := dm-memcache.o dm-region-hash.o dm-message.o
> 
> I would have done as:
> -obj-$(CONFIG_DM_RAID45) += dm-raid4-5.o dm-mem-cache.o dm-region_hash.o 
> dm-message.o
> +dm-raid45-objs := dm-raid45.o dm-memcache.o dm-region-hash.o dm-message.o
> +obj-$(CONFIG_DM_RAID45) := dm-raid45.o

I believe that when you use the dm-raid45-objs form that there is an
implicit construction of a new dm-raid45.o from the .o's on the right.
I would have expected you to need to leave the main file called
dm-raid4-5.c and then to have the following to make the dm-raid45.ko

dm-raid45-objs := dm-raid4-5.o dm-memcache.o dm-region-hash.o dm-message.o
obj-$(CONFIG_DM_RAID45) := dm-raid45.o

-apw