Skip to content

Commit

Permalink
[SCSI] st: rename flush_write_buffer()
Browse files Browse the repository at this point in the history
This patch fixes the following namespace collision with
include/asm-avr32/cacheflush.h :

<--  snip  -->

...
  CC [M]  drivers/scsi/st.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/scsi/st.c:629:53: error: macro "flush_write_buffer" passed 1 arguments, but takes just 0
...
make[3]: *** [drivers/scsi/st.o] Error 1

<--  snip  -->

st now uses st_flush_write_buffer()

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
Adrian Bunk authored and James Bottomley committed Apr 16, 2008
1 parent b312bab commit 8ef8d59
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/scsi/st.c
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ static int cross_eof(struct scsi_tape * STp, int forward)


/* Flush the write buffer (never need to write if variable blocksize). */
static int flush_write_buffer(struct scsi_tape * STp)
static int st_flush_write_buffer(struct scsi_tape * STp)
{
int offset, transfer, blks;
int result;
Expand Down Expand Up @@ -719,7 +719,7 @@ static int flush_buffer(struct scsi_tape *STp, int seek_next)
return 0;
STps = &(STp->ps[STp->partition]);
if (STps->rw == ST_WRITING) /* Writing */
return flush_write_buffer(STp);
return st_flush_write_buffer(STp);

if (STp->block_size == 0)
return 0;
Expand Down Expand Up @@ -1214,7 +1214,7 @@ static int st_flush(struct file *filp, fl_owner_t id)
return 0;

if (STps->rw == ST_WRITING && !STp->pos_unknown) {
result = flush_write_buffer(STp);
result = st_flush_write_buffer(STp);
if (result != 0 && result != (-ENOSPC))
goto out;
}
Expand Down

0 comments on commit 8ef8d59

Please sign in to comment.