On Thu, 2015-01-29 at 16:56 -0800, Andy Grover wrote: > This will enable user programs to have access to the most current > definitions. > > Modify include sites for new path. > > Signed-off-by: Andy Grover <agrover@xxxxxxxxxx> > --- > block/bio.c | 2 +- > block/blk-map.c | 2 +- > block/bsg.c | 2 +- > block/scsi_ioctl.c | 2 +- > drivers/block/aoe/aoeblk.c | 2 +- > drivers/block/cciss.c | 2 +- > drivers/block/nvme-core.c | 2 +- > drivers/block/nvme-scsi.c | 2 +- > drivers/block/skd_main.c | 2 +- > drivers/message/i2o/i2o_scsi.c | 2 +- > drivers/scsi/ips.c | 2 +- > drivers/scsi/scsi_error.c | 2 +- > drivers/scsi/scsi_ioctl.c | 2 +- > drivers/scsi/sg.c | 2 +- > drivers/scsi/st.c | 2 +- > fs/compat_ioctl.c | 2 +- > include/scsi/sg.h | 274 ----------------------------------------- > include/uapi/linux/Kbuild | 1 + > include/uapi/linux/sg.h | 274 +++++++++++++++++++++++++++++++++++++++++ > kernel/sysctl.c | 2 +- > 20 files changed, 292 insertions(+), 291 deletions(-) > delete mode 100644 include/scsi/sg.h > create mode 100644 include/uapi/linux/sg.h > > diff --git a/block/bio.c b/block/bio.c > index 471d738..ca072bb 100644 > --- a/block/bio.c > +++ b/block/bio.c > @@ -28,7 +28,7 @@ > #include <linux/mempool.h> > #include <linux/workqueue.h> > #include <linux/cgroup.h> > -#include <scsi/sg.h> /* for struct sg_iovec */ > +#include <uapi/linux/sg.h> /* for struct sg_iovec */ Good grief, not like this, please. uapi/linux/sg.h becomes our public, or exported set of interfaces, but keep scsi/sg.h as our internal set but have it include uapi/linux/sg.h (like you did for scsi.h). That way if we have any kernel private sg stuff, it stays in scsi/sg.h plus we don't need to patch the #include path in fifty odd drivers. Same goes for scsi_ioctl.h James -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
