PATCH: ll_rw_block cleanup

From: Juan J. Quintela (quintela@fi.udc.es)
Date: Wed Jul 12 2000 - 12:39:44 EST


Hi
        There is a defined function: ll_rw_blocked that:
- It is not exported for use in modules
- It is not exported in any header
- It is not used in the whole kernel tar bar

It can be safely removed or if it is needed for some other external
patches, document it with a comment stating where is used.

Later, Juan.

diff -urN --exclude-from=/home/lfcia/quintela/work/kernel/exclude test4-pre3/drivers/block/ll_rw_blk.c kkita/drivers/block/ll_rw_blk.c
--- test4-pre3/drivers/block/ll_rw_blk.c Fri Jul 7 04:25:21 2000
+++ kkita/drivers/block/ll_rw_blk.c Wed Jul 12 19:34:26 2000
@@ -792,8 +792,7 @@
    device. Currently the only restriction is that all buffers must belong to
    the same device */
 
-static void __ll_rw_block(int rw, int nr, struct buffer_head * bhs[],
- int haslock)
+void ll_rw_block(int rw, int nr, struct buffer_head * bhs[])
 {
         struct buffer_head *bh;
         request_queue_t *q;
@@ -840,13 +839,9 @@
                 bh = bhs[i];
 
                 /* Only one thread can actually submit the I/O. */
- if (haslock) {
- if (!buffer_locked(bh))
- BUG();
- } else {
- if (test_and_set_bit(BH_Lock, &bh->b_state))
- continue;
- }
+ if (test_and_set_bit(BH_Lock, &bh->b_state))
+ continue;
+
                 set_bit(BH_Req, &bh->b_state);
 
                 /*
@@ -865,15 +860,6 @@
                 buffer_IO_error(bhs[i]);
 }
 
-void ll_rw_block(int rw, int nr, struct buffer_head * bh[])
-{
- __ll_rw_block(rw, nr, bh, 0);
-}
-
-void ll_rw_block_locked(int rw, int nr, struct buffer_head * bh[])
-{
- __ll_rw_block(rw, nr, bh, 1);
-}
 
 #ifdef CONFIG_STRAM_SWAP
 extern int stram_device_init (void);

       

-- 
In theory, practice and theory are the same, but in practice they 
are different -- Larry McVoy

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



This archive was generated by hypermail 2b29 : Sat Jul 15 2000 - 21:00:15 EST