Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2020-05-13 13:52:37 -07:00
2 changed files with 0 additions and 7 deletions

View File

@@ -5093,12 +5093,6 @@ static inline int scst_get_sg_page_next(struct scst_cmd *cmd,
return __scst_get_sg_page(cmd, cmd->sg_cnt, page, offset);
}
static inline void scst_put_sg_page(struct scst_cmd *cmd,
struct page *page, int offset)
{
/* Nothing to do */
}
static inline int scst_get_out_sg_page_first(struct scst_cmd *cmd,
struct page **page, int *offset)
{

View File

@@ -6230,7 +6230,6 @@ static void blockio_exec_rw(struct vdisk_cmd_params *p, bool write, bool fua)
lba_start += length >> block_shift;
scst_put_sg_page(cmd, page, offset);
length = scst_get_sg_page_next(cmd, &page, &offset);
}