Commit:     c0613c1c940dac991b9e54db75dc9976491d9f0a
Parent:     70cee26e020c1d74ff559c991b96c7b19fa4173b
Author:     Geert Uytterhoeven <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 10 12:26:29 2007 +0200
Committer:  Jens Axboe <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 13:43:34 2007 +0200

    Documentation/block/barrier.txt is not in sync with the actual code: - 
blk_queue_ordered() no longer has a gfp_mask parameter - 
blk_queue_ordered_locked() no longer exists - sd_prepare_flush() looks slightly 
    Signed-off-by: Geert Uytterhoeven <[EMAIL PROTECTED]>
    Acked-by: Tejun Heo <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Jens Axboe <[EMAIL PROTECTED]>
 Documentation/block/barrier.txt |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Documentation/block/barrier.txt b/Documentation/block/barrier.txt
index a272c3d..7d279f2 100644
--- a/Documentation/block/barrier.txt
+++ b/Documentation/block/barrier.txt
@@ -82,23 +82,12 @@ including draining and flushing.
 typedef void (prepare_flush_fn)(request_queue_t *q, struct request *rq);
 int blk_queue_ordered(request_queue_t *q, unsigned ordered,
-                     prepare_flush_fn *prepare_flush_fn,
-                     unsigned gfp_mask);
-int blk_queue_ordered_locked(request_queue_t *q, unsigned ordered,
-                            prepare_flush_fn *prepare_flush_fn,
-                            unsigned gfp_mask);
-The only difference between the two functions is whether or not the
-caller is holding q->queue_lock on entry.  The latter expects the
-caller is holding the lock.
+                     prepare_flush_fn *prepare_flush_fn);
 @q                     : the queue in question
 @ordered               : the ordered mode the driver/device supports
 @prepare_flush_fn      : this function should prepare @rq such that it
                          flushes cache to physical medium when executed
[EMAIL PROTECTED]               : gfp_mask used when allocating data structures
-                         for ordered processing
 For example, SCSI disk driver's prepare_flush_fn looks like the
@@ -106,9 +95,10 @@ following.
 static void sd_prepare_flush(request_queue_t *q, struct request *rq)
        memset(rq->cmd, 0, sizeof(rq->cmd));
-       rq->flags |= REQ_BLOCK_PC;
+       rq->cmd_type = REQ_TYPE_BLOCK_PC;
        rq->timeout = SD_TIMEOUT;
        rq->cmd[0] = SYNCHRONIZE_CACHE;
+       rq->cmd_len = 10;
 The following seven ordered modes are supported.  The following table
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to