Re: [PATCH v3 00/11] firewire-sbp-target: FireWire SBP-2 SCSItarget

[Nicholas A. Bellinger]

On Fri, 2012-04-13 at 14:16 +0100, Chris Boot wrote:
> On 13/04/2012 04:03, Nicholas A. Bellinger wrote:

<SNIP>

> > So I've merged a squashed version this series from:
> >
> >    https://github.com/bootc/Linux-SBP-2-Target.git patch-v3
> >
> > into lio-core/master, and have now pushed to k.o upstream
> 
> Thanks!
> 
> > This looks to me like a reasonable candidate for a v3.5 mainline merge,
> > so we need to go ahead and get this into target-pending..  Also, thanks
> > for getting Stefan's ACK's here on the drivers/firmware/ specific
> > changes..
> >
> > So for new fabric drivers (as discused with Sebastian and usb-gadget
> > recently) that the target team has been enforcing that new fabric
> > modules convert to use a single source / header file for readability and
> > maintainability purposes.
> >
> > It would be great if you can publish one more branch (no need to re-post
> > the full diff) that takes your patch-v3 down to a single .c/.h file.
> > Otherwise, I'm fine to take the 15 minutes to do this conversion ahead
> > of dropping into target-pending for the sunday night linux-next build.
> 
> I'll get onto it over the weekend, I hope. I assume in this case I just 
> stick it all in drivers/target/ instead of having a sbp/ directory 
> underneath that?
> 

I was eager to see this change, so I decided to go ahead and do the
mechanical conversion myself in the following branch:

  git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core.git sbp-merge

As mentioned, it converts drivers/target/sbp/ to use a single sbp_target.[c,h]
source/header file following mainline convention for new target fabric
drivers.  Also make as many functions as possible statically defined and
add inline prototypes where necessary.

This patch also renames the sbp-target config entry from:

    FIREWIRE_SBP_TARGET -> SBP_TARGET

and also renames the final generated module name from:

    fireware-sbp-target.ko -> sbp_target.ko

Here is what the diffstat ends up looking like:

 drivers/target/Makefile                   |    2 +-
 drivers/target/sbp/Kconfig                |    6 +-
 drivers/target/sbp/Makefile               |   12 +-
 drivers/target/sbp/sbp_base.h             |  211 ---
 drivers/target/sbp/sbp_configfs.c         |  737 --------
 drivers/target/sbp/sbp_fabric.c           |  314 ----
 drivers/target/sbp/sbp_fabric.h           |   40 -
 drivers/target/sbp/sbp_login.c            |  672 --------
 drivers/target/sbp/sbp_login.h            |   17 -
 drivers/target/sbp/sbp_management_agent.c |  255 ---
 drivers/target/sbp/sbp_management_agent.h |   34 -
 drivers/target/sbp/sbp_scsi_cmnd.c        |  430 -----
 drivers/target/sbp/sbp_scsi_cmnd.h        |   12 -
 drivers/target/sbp/sbp_target.c           | 2621 +++++++++++++++++++++++++++++
 drivers/target/sbp/sbp_target.h           |  254 +++
 drivers/target/sbp/sbp_target_agent.c     |  395 -----
 drivers/target/sbp/sbp_target_agent.h     |   40 -
 17 files changed, 2879 insertions(+), 3173 deletions(-)
 delete mode 100644 drivers/target/sbp/sbp_base.h
 delete mode 100644 drivers/target/sbp/sbp_configfs.c
 delete mode 100644 drivers/target/sbp/sbp_fabric.c
 delete mode 100644 drivers/target/sbp/sbp_fabric.h
 delete mode 100644 drivers/target/sbp/sbp_login.c
 delete mode 100644 drivers/target/sbp/sbp_login.h
 delete mode 100644 drivers/target/sbp/sbp_management_agent.c
 delete mode 100644 drivers/target/sbp/sbp_management_agent.h
 delete mode 100644 drivers/target/sbp/sbp_scsi_cmnd.c
 delete mode 100644 drivers/target/sbp/sbp_scsi_cmnd.h
 create mode 100644 drivers/target/sbp/sbp_target.c
 create mode 100644 drivers/target/sbp/sbp_target.h
 delete mode 100644 drivers/target/sbp/sbp_target_agent.c
 delete mode 100644 drivers/target/sbp/sbp_target_agent.h


Please have a look at this branch over the next days, and if you're OK
with the re-org changes I'll go ahead and merge this into
lio-core/master, and drop into target-pending for sunday night's build.

Thanks Chris!

--nab

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/