block bits for 2.6.31-rc4
Hi,
Some minor bits for 2.6.31-rc4. 4 fixes for mg_disk, one fix for an oops regression on reading/writing to some sysfs files for ->make_request_fn based drivers, fixing a silly shared io context thinko, and reverting the _GPL'ness of the end_io function exports.
git://git.kernel.dk/linux-2.6-block.git for-linus
Bartlomiej Zolnierkiewicz (1):
mg_disk: fix issue with data integrity on error in mg_write()
Jens Axboe (2):
block: always assign default lock to queues
block: make the end_io functions be non-GPL exports
Li Zefan (1):
io context: fix ref counting
Xiaotian Feng (1):
block: fix improper kobject release in blk_integrity_unregister
unsik Kim (3):
mg_disk: remove prohibited sleep operation
mg_disk: fix reading invalid status when use polling driver
mg_disk: Add missing ready status check on mg_write()
block/blk-core.c | 19 +++------ block/blk-integrity.c | 1 + block/blk-settings.c | 7 +++ drivers/block/mg_disk.c | 101 +++++++++++++++++++++++++-------------------- include/linux/iocontext.h | 2 +- 5 files changed, 71 insertions(+), 59 deletions(-)
block/blk-core.c +6 -13
@@ -575,13 +575,6 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)return NULL ; } -/* -* if caller didn't supply a lock, they get per-queue locking with -* our embedded lock -*/ -if (!lock) - lock = &q->__queue_lock; - q->request_fn = rfn; q->prep_rq_fn =NULL ; q->unplug_fn = generic_unplug_device;
@@ -2143,7 +2136,7 @@ bool blk_end_request(struct request *rq, int error, unsigned int nr_bytes) {return blk_end_bidi_request (rq, error, nr_bytes,0 ); } -EXPORT_SYMBOL_GPL (blk_end_request); +EXPORT_SYMBOL (blk_end_request);/** * blk_end_request_all - Helper function for drives to finish the request.
@@ -2164,7 +2157,7 @@ void blk_end_request_all(struct request *rq, int error) pending =blk_end_bidi_request (rq, error,blk_rq_bytes (rq), bidi_bytes);BUG_ON (pending); } -EXPORT_SYMBOL_GPL (blk_end_request_all); +EXPORT_SYMBOL (blk_end_request_all);/** * blk_end_request_cur - Helper function to finish the current request chunk.
@@ -2182,7 +2175,7 @@ bool blk_end_request_cur(struct request *rq, int error) {return blk_end_request (rq, error,blk_rq_cur_bytes (rq)); } -EXPORT_SYMBOL_GPL (blk_end_request_cur); +EXPORT_SYMBOL (blk_end_request_cur);/** * __blk_end_request - Helper function for drivers to complete the request.
@@ -2201,7 +2194,7 @@ bool __blk_end_request(struct request *rq, int error, unsigned int nr_bytes) {return __blk_end_bidi_request (rq, error, nr_bytes,0 ); } -EXPORT_SYMBOL_GPL (__blk_end_request); +EXPORT_SYMBOL (__blk_end_request);/** * __blk_end_request_all - Helper function for drives to finish the request.
@@ -2222,7 +2215,7 @@ void __blk_end_request_all(struct request *rq, int error) pending =__blk_end_bidi_request (rq, error,blk_rq_bytes (rq), bidi_bytes);BUG_ON (pending); } -EXPORT_SYMBOL_GPL (__blk_end_request_all); +EXPORT_SYMBOL (__blk_end_request_all);/** * __blk_end_request_cur - Helper function to finish the current request chunk.
@@ -2241,7 +2234,7 @@ bool __blk_end_request_cur(struct request *rq, int error) {return __blk_end_request (rq, error,blk_rq_cur_bytes (rq)); } -EXPORT_SYMBOL_GPL (__blk_end_request_cur); +EXPORT_SYMBOL (__blk_end_request_cur);void blk_rq_bio_prep (struct request_queue *q,struct request *rq,struct bio *bio)
block/blk-integrity.c +1 -0
@@ -379,6 +379,7 @@ void blk_integrity_unregister(struct gendisk *disk)kobject_uevent (&bi->kobj,KOBJ_REMOVE );kobject_del (&bi->kobj); +kobject_put (&bi->kobj);kmem_cache_free (integrity_cachep, bi); disk->integrity =NULL ; }
block/blk-settings.c +7 -0
@@ -165,6 +165,13 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn)blk_set_default_limits (&q->limits);/* +* If the caller didn't supply a lock, fall back to our embedded +* per-queue locks +*/ +if (!q->queue_lock) + q->queue_lock = &q->__queue_lock; + +/* * by default assume old behaviour and bounce for any highmem page */ blk_queue_bounce_limit (q,BLK_BOUNCE_HIGH );
drivers/block/mg_disk.c +56 -45
196 lines not on this page · raw message
include/linux/iocontext.h +1 -1
@@ -92,7 +92,7 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc)* a race). */ if (ioc &&atomic_long_inc_not_zero (&ioc->refcount)) { -atomic_long_inc (&ioc->refcount); +atomic_inc (&ioc->nr_tasks);return ioc; }
Signature · 1 line
Jens Axboe