Skip to content

Commit

Permalink
[SCSI] st: remove struct scatterlist
Browse files Browse the repository at this point in the history
This removes the usage of struct scatterlist completely.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Kai Makisara <Kai.Makisara@kolumbus.fi>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
FUJITA Tomonori authored and James Bottomley committed Jan 2, 2009
1 parent 08c9583 commit b3d5911
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
8 changes: 2 additions & 6 deletions drivers/scsi/st.c
Original file line number Diff line number Diff line change
Expand Up @@ -3744,7 +3744,7 @@ static long st_compat_ioctl(struct file *file, unsigned int cmd, unsigned long a
static struct st_buffer *
new_tape_buffer(int from_initialization, int need_dma, int max_sg)
{
int i, got = 0;
int got = 0;
gfp_t priority;
struct st_buffer *tb;

Expand All @@ -3753,10 +3753,7 @@ static struct st_buffer *
else
priority = GFP_KERNEL;

i = sizeof(struct st_buffer) +
(max_sg - 1) * sizeof(struct scatterlist);

tb = kzalloc(i, priority);
tb = kzalloc(sizeof(struct st_buffer), priority);
if (!tb) {
printk(KERN_NOTICE "st: Can't allocate new tape buffer.\n");
return NULL;
Expand All @@ -3766,7 +3763,6 @@ static struct st_buffer *

tb->dma = need_dma;
tb->buffer_size = got;
sg_init_table(tb->sg, max_sg);

tb->reserved_pages = kzalloc(max_sg * sizeof(struct page *), priority);
if (!tb->reserved_pages) {
Expand Down
1 change: 0 additions & 1 deletion drivers/scsi/st.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ struct st_buffer {
unsigned short orig_frp_segs; /* number of segments allocated at first try */
unsigned short frp_segs; /* number of buffer segments */
unsigned int frp_sg_current; /* driver buffer length currently in s/g list */
struct scatterlist sg[1]; /* MUST BE last item */
};

/* The tape mode definition */
Expand Down

0 comments on commit b3d5911

Please sign in to comment.