fat: Fix and cleanup timestamp conversion

[linux-2.6-omap-h63xx.git] / Documentation / block / barrier.txt

diff --git a/Documentation/block/barrier.txt b/Documentation/block/barrier.txt
index a272c3db80940bd5821e8b2f28068e3fe5d5a65b..2c2f24f634e48c138aec7eefb48de127e93bdafb 100644 (file)
--- a/Documentation/block/barrier.txt
+++ b/Documentation/block/barrier.txt
@@ -79,36 +79,26 @@ and how to prepare flush requests.  Note that the term 'ordered' is
 used to indicate the whole sequence of performing barrier requests
 including draining and flushing.
 
 used to indicate the whole sequence of performing barrier requests
 including draining and flushing.
 

-typedef void (prepare_flush_fn)(request_queue_t *q, struct request *rq);
+typedef void (prepare_flush_fn)(struct request_queue *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.
+int blk_queue_ordered(struct request_queue *q, unsigned ordered,
+                     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
 
 @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

-@gfp_mask              : gfp_mask used when allocating data structures
-                         for ordered processing

 
 For example, SCSI disk driver's prepare_flush_fn looks like the
 following.
 
 
 For example, SCSI disk driver's prepare_flush_fn looks like the
 following.
 

-static void sd_prepare_flush(request_queue_t *q, struct request *rq)
+static void sd_prepare_flush(struct request_queue *q, struct request *rq)

 {
        memset(rq->cmd, 0, sizeof(rq->cmd));
 {
        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->timeout = SD_TIMEOUT;
        rq->cmd[0] = SYNCHRONIZE_CACHE;

+       rq->cmd_len = 10;

 }
 
 The following seven ordered modes are supported.  The following table
 }
 
 The following seven ordered modes are supported.  The following table