[SCSI] libosd: osd_req_{read,write}_kern new API

By popular demand, define usefull wrappers for osd_req_read/write
that recieve kernel pointers. All users had their own.

Also remove these from exofs

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 15f0bbc19c9c1e05e61eb8f72117d42ef9860968..c98153bfb36decdecc2c8cffd466f015bb4424b3 100644 (file)
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -789,6 +789,20 @@ void osd_req_write(struct osd_request *or,
 }
 EXPORT_SYMBOL(osd_req_write);
 
+int osd_req_write_kern(struct osd_request *or,
+       const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
+{
+       struct request_queue *req_q = or->osd_dev->scsi_device->request_queue;
+       struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
+
+       if (IS_ERR(bio))
+               return PTR_ERR(bio);
+
+       osd_req_write(or, obj, bio, offset);
+       return 0;
+}
+EXPORT_SYMBOL(osd_req_write_kern);
+
 /*TODO: void osd_req_append(struct osd_request *,
        const struct osd_obj_id *, struct bio *data_out); */
 /*TODO: void osd_req_create_write(struct osd_request *,
@@ -824,6 +838,20 @@ void osd_req_read(struct osd_request *or,
 }
 EXPORT_SYMBOL(osd_req_read);
 
+int osd_req_read_kern(struct osd_request *or,
+       const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
+{
+       struct request_queue *req_q = or->osd_dev->scsi_device->request_queue;
+       struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
+
+       if (IS_ERR(bio))
+               return PTR_ERR(bio);
+
+       osd_req_read(or, obj, bio, offset);
+       return 0;
+}
+EXPORT_SYMBOL(osd_req_read_kern);
+
 void osd_req_get_attributes(struct osd_request *or,
        const struct osd_obj_id *obj)
 {

diff --git a/fs/exofs/common.h b/fs/exofs/common.h
index b1512c4bb8c71d076dd5d27e1b7f08cda00c2e75..24667eedc02329554735f72420cbc04d99faa871 100644 (file)
--- a/fs/exofs/common.h
+++ b/fs/exofs/common.h
@@ -175,10 +175,4 @@ int exofs_async_op(struct osd_request *or,
 
 int extract_attr_from_req(struct osd_request *or, struct osd_attr *attr);
 
-int osd_req_read_kern(struct osd_request *or,
-       const struct osd_obj_id *obj, u64 offset, void *buff, u64 len);
-
-int osd_req_write_kern(struct osd_request *or,
-       const struct osd_obj_id *obj, u64 offset, void *buff, u64 len);
-
 #endif /*ifndef __EXOFS_COM_H__*/

diff --git a/fs/exofs/osd.c b/fs/exofs/osd.c
index b249ae97fb15bfb24e1835a41d351110c7ae3ef9..48cc4d11d3fbff46c4fe10521ed1debfaf4ec10b 100644 (file)
--- a/fs/exofs/osd.c
+++ b/fs/exofs/osd.c
@@ -125,29 +125,3 @@ int extract_attr_from_req(struct osd_request *or, struct osd_attr *attr)
 
        return -EIO;
 }
-
-int osd_req_read_kern(struct osd_request *or,
-       const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
-{
-       struct request_queue *req_q = or->osd_dev->scsi_device->request_queue;
-       struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
-
-       if (!bio)
-               return -ENOMEM;
-
-       osd_req_read(or, obj, bio, offset);
-       return 0;
-}
-
-int osd_req_write_kern(struct osd_request *or,
-       const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
-{
-       struct request_queue *req_q = or->osd_dev->scsi_device->request_queue;
-       struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
-
-       if (!bio)
-               return -ENOMEM;
-
-       osd_req_write(or, obj, bio, offset);
-       return 0;
-}

diff --git a/include/scsi/osd_initiator.h b/include/scsi/osd_initiator.h
index b24d9616eb469f2afbcdd02f32dbdd9cae6eae3d..6132790d678fbcec80de0d408d14a9360f7b96ff 100644 (file)
--- a/include/scsi/osd_initiator.h
+++ b/include/scsi/osd_initiator.h
@@ -364,6 +364,8 @@ void osd_req_remove_object(struct osd_request *or, struct osd_obj_id *);
 
 void osd_req_write(struct osd_request *or,
        const struct osd_obj_id *, struct bio *data_out, u64 offset);
+int osd_req_write_kern(struct osd_request *or,
+       const struct osd_obj_id *obj, u64 offset, void *buff, u64 len);
 void osd_req_append(struct osd_request *or,
        const struct osd_obj_id *, struct bio *data_out);/* NI */
 void osd_req_create_write(struct osd_request *or,
@@ -379,6 +381,8 @@ void osd_req_flush_object(struct osd_request *or,
 
 void osd_req_read(struct osd_request *or,
        const struct osd_obj_id *, struct bio *data_in, u64 offset);
+int osd_req_read_kern(struct osd_request *or,
+       const struct osd_obj_id *obj, u64 offset, void *buff, u64 len);
 
 /*
  * Root/Partition/Collection/Object Attributes commands