diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-07-28 16:11:24 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-07-28 16:11:24 -0400 |
commit | 56ad1740d9a8dc271e71fee234be662638c64458 (patch) | |
tree | bf060081bde4063a4d02d1da63f79e412cca329c | |
parent | 3839e4b29b4385e4b31075e7805683e2aa2a8103 (diff) |
block: make the end_io functions be non-GPL exports
Prior to the change for more sane end_io functions, we exported
the helpers with the normal EXPORT_SYMBOL(). That got changed
to _GPL() for the new interface. Revert that particular change,
on the basis that this is basic functionality and doesn't dip
into internal structures. If these exports can't be non-GPL,
then we may as well make EXPORT_SYMBOL() imply GPL for
everything.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r-- | block/blk-core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index a0c340d239b0..e3299a77a0d8 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -2136,7 +2136,7 @@ bool blk_end_request(struct request *rq, int error, unsigned int nr_bytes) | |||
2136 | { | 2136 | { |
2137 | return blk_end_bidi_request(rq, error, nr_bytes, 0); | 2137 | return blk_end_bidi_request(rq, error, nr_bytes, 0); |
2138 | } | 2138 | } |
2139 | EXPORT_SYMBOL_GPL(blk_end_request); | 2139 | EXPORT_SYMBOL(blk_end_request); |
2140 | 2140 | ||
2141 | /** | 2141 | /** |
2142 | * blk_end_request_all - Helper function for drives to finish the request. | 2142 | * blk_end_request_all - Helper function for drives to finish the request. |
@@ -2157,7 +2157,7 @@ void blk_end_request_all(struct request *rq, int error) | |||
2157 | pending = blk_end_bidi_request(rq, error, blk_rq_bytes(rq), bidi_bytes); | 2157 | pending = blk_end_bidi_request(rq, error, blk_rq_bytes(rq), bidi_bytes); |
2158 | BUG_ON(pending); | 2158 | BUG_ON(pending); |
2159 | } | 2159 | } |
2160 | EXPORT_SYMBOL_GPL(blk_end_request_all); | 2160 | EXPORT_SYMBOL(blk_end_request_all); |
2161 | 2161 | ||
2162 | /** | 2162 | /** |
2163 | * blk_end_request_cur - Helper function to finish the current request chunk. | 2163 | * blk_end_request_cur - Helper function to finish the current request chunk. |
@@ -2175,7 +2175,7 @@ bool blk_end_request_cur(struct request *rq, int error) | |||
2175 | { | 2175 | { |
2176 | return blk_end_request(rq, error, blk_rq_cur_bytes(rq)); | 2176 | return blk_end_request(rq, error, blk_rq_cur_bytes(rq)); |
2177 | } | 2177 | } |
2178 | EXPORT_SYMBOL_GPL(blk_end_request_cur); | 2178 | EXPORT_SYMBOL(blk_end_request_cur); |
2179 | 2179 | ||
2180 | /** | 2180 | /** |
2181 | * __blk_end_request - Helper function for drivers to complete the request. | 2181 | * __blk_end_request - Helper function for drivers to complete the request. |
@@ -2194,7 +2194,7 @@ bool __blk_end_request(struct request *rq, int error, unsigned int nr_bytes) | |||
2194 | { | 2194 | { |
2195 | return __blk_end_bidi_request(rq, error, nr_bytes, 0); | 2195 | return __blk_end_bidi_request(rq, error, nr_bytes, 0); |
2196 | } | 2196 | } |
2197 | EXPORT_SYMBOL_GPL(__blk_end_request); | 2197 | EXPORT_SYMBOL(__blk_end_request); |
2198 | 2198 | ||
2199 | /** | 2199 | /** |
2200 | * __blk_end_request_all - Helper function for drives to finish the request. | 2200 | * __blk_end_request_all - Helper function for drives to finish the request. |
@@ -2215,7 +2215,7 @@ void __blk_end_request_all(struct request *rq, int error) | |||
2215 | pending = __blk_end_bidi_request(rq, error, blk_rq_bytes(rq), bidi_bytes); | 2215 | pending = __blk_end_bidi_request(rq, error, blk_rq_bytes(rq), bidi_bytes); |
2216 | BUG_ON(pending); | 2216 | BUG_ON(pending); |
2217 | } | 2217 | } |
2218 | EXPORT_SYMBOL_GPL(__blk_end_request_all); | 2218 | EXPORT_SYMBOL(__blk_end_request_all); |
2219 | 2219 | ||
2220 | /** | 2220 | /** |
2221 | * __blk_end_request_cur - Helper function to finish the current request chunk. | 2221 | * __blk_end_request_cur - Helper function to finish the current request chunk. |
@@ -2234,7 +2234,7 @@ bool __blk_end_request_cur(struct request *rq, int error) | |||
2234 | { | 2234 | { |
2235 | return __blk_end_request(rq, error, blk_rq_cur_bytes(rq)); | 2235 | return __blk_end_request(rq, error, blk_rq_cur_bytes(rq)); |
2236 | } | 2236 | } |
2237 | EXPORT_SYMBOL_GPL(__blk_end_request_cur); | 2237 | EXPORT_SYMBOL(__blk_end_request_cur); |
2238 | 2238 | ||
2239 | void blk_rq_bio_prep(struct request_queue *q, struct request *rq, | 2239 | void blk_rq_bio_prep(struct request_queue *q, struct request *rq, |
2240 | struct bio *bio) | 2240 | struct bio *bio) |