diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-21 10:11:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-21 10:11:32 -0800 |
| commit | 52aa536f5a78bbba9205d296f53d2f8a424a3b08 (patch) | |
| tree | 29ccde2430d7dd34420761b7fde4a8c8976fe76c /include/linux | |
| parent | 5914811acf36c3ff091f860a6964808f668f27d0 (diff) | |
| parent | 2e242fa994428bd1a40b6a7e97430413246d0a16 (diff) | |
| download | linux-3.10-52aa536f5a78bbba9205d296f53d2f8a424a3b08.tar.gz linux-3.10-52aa536f5a78bbba9205d296f53d2f8a424a3b08.tar.bz2 linux-3.10-52aa536f5a78bbba9205d296f53d2f8a424a3b08.zip | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 9e5db2949c5..c91be5e64ed 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -557,17 +557,29 @@ ata_sg_is_last(struct scatterlist *sg, struct ata_queued_cmd *qc) } static inline struct scatterlist * +ata_qc_first_sg(struct ata_queued_cmd *qc) +{ + if (qc->n_elem) + return qc->__sg; + if (qc->pad_len) + return &qc->pad_sgent; + return NULL; +} + +static inline struct scatterlist * ata_qc_next_sg(struct scatterlist *sg, struct ata_queued_cmd *qc) { if (sg == &qc->pad_sgent) return NULL; if (++sg - qc->__sg < qc->n_elem) return sg; - return qc->pad_len ? &qc->pad_sgent : NULL; + if (qc->pad_len) + return &qc->pad_sgent; + return NULL; } #define ata_for_each_sg(sg, qc) \ - for (sg = qc->__sg; sg; sg = ata_qc_next_sg(sg, qc)) + for (sg = ata_qc_first_sg(qc); sg; sg = ata_qc_next_sg(sg, qc)) static inline unsigned int ata_tag_valid(unsigned int tag) { |