diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:22:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:16:50 -0700 |
commit | c53033f6b0bd7cc133b7f433083f0394cf29ac70 (patch) | |
tree | 0e53b6f65b41f69de987e6b2a96248218933d497 /drivers/scsi/osst.c | |
parent | 9796fdd829da626374458e8706daedcc0e432ddd (diff) | |
download | linux-stable-c53033f6b0bd7cc133b7f433083f0394cf29ac70.tar.gz linux-stable-c53033f6b0bd7cc133b7f433083f0394cf29ac70.tar.bz2 linux-stable-c53033f6b0bd7cc133b7f433083f0394cf29ac70.zip |
[PATCH] gfp_t: drivers/scsi
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/osst.c')
-rw-r--r-- | drivers/scsi/osst.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 3f2f2464fa63..af1133104b3f 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c @@ -5146,7 +5146,8 @@ static long osst_compat_ioctl(struct file * file, unsigned int cmd_in, unsigned /* Try to allocate a new tape buffer skeleton. Caller must not hold os_scsi_tapes_lock */ static struct osst_buffer * new_tape_buffer( int from_initialization, int need_dma, int max_sg ) { - int i, priority; + int i; + gfp_t priority; struct osst_buffer *tb; if (from_initialization) @@ -5178,7 +5179,8 @@ static struct osst_buffer * new_tape_buffer( int from_initialization, int need_d /* Try to allocate a temporary (while a user has the device open) enlarged tape buffer */ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma) { - int segs, nbr, max_segs, b_size, priority, order, got; + int segs, nbr, max_segs, b_size, order, got; + gfp_t priority; if (STbuffer->buffer_size >= OS_FRAME_SIZE) return 1; |