mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 03:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst: Simplify __scst_get_buf() and __scst_get_sg_page()

Browse Source 
Signed-off-by: Bart Van Assche <bvanassche@acm.org>

with some further simplifications



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4673 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2012-12-31 23:48:03 +00:00
parent df5faa838e
commit d03c8b7729
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scst/include/scst.h
View File

@@ -3753,6 +3753,15 @@ static inline struct scatterlist *sg_next(struct scatterlist *sg)
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) */
static inline struct scatterlist *sg_next_inline(struct scatterlist *sg)
{
sg++;
if (unlikely(sg_is_chain(sg)))
sg = sg_chain_ptr(sg);
return sg;
}
static inline void sg_clear(struct scatterlist *sg)
{
memset(sg, 0, sizeof(*sg));
@@ -3792,16 +3801,13 @@ static inline int __scst_get_buf(struct scst_cmd *cmd, int sg_cnt,
goto out;
}
if (unlikely(sg_is_chain(sg)))
sg = sg_chain_ptr(sg);
*buf = page_address(sg_page(sg));
*buf += sg->offset;
res = sg->length;
cmd->get_sg_buf_entry_num++;
cmd->get_sg_buf_cur_sg_entry = ++sg;
cmd->get_sg_buf_cur_sg_entry = sg_next_inline(sg);
out:
return res;
@@ -3898,15 +3904,12 @@ static inline int __scst_get_sg_page(struct scst_cmd *cmd, int sg_cnt,
goto out;
}
if (unlikely(sg_is_chain(sg)))
sg = sg_chain_ptr(sg);
*page = sg_page(sg);
*offset = sg->offset;
res = sg->length;
cmd->get_sg_buf_entry_num++;
cmd->get_sg_buf_cur_sg_entry = ++sg;
cmd->get_sg_buf_cur_sg_entry = sg_next_inline(sg);
out:
return res;