diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-04-14 10:17:16 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-04-16 10:23:46 -0400 |
commit | 8ef8d5941cdc6ab616334e14306c39f7aceb780c (patch) | |
tree | b03ff1ce50d7ebe271d22b7c46a00505a334cef0 /drivers/scsi | |
parent | b312bab3b961de21c5a98bd70e04070eaa61817c (diff) |
[SCSI] st: rename flush_write_buffer()
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/st.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index d204aad2e683..df83bea2c620 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
@@ -628,7 +628,7 @@ static int cross_eof(struct scsi_tape * STp, int forward) | |||
628 | 628 | ||
629 | 629 | ||
630 | /* Flush the write buffer (never need to write if variable blocksize). */ | 630 | /* Flush the write buffer (never need to write if variable blocksize). */ |
631 | static int flush_write_buffer(struct scsi_tape * STp) | 631 | static int st_flush_write_buffer(struct scsi_tape * STp) |
632 | { | 632 | { |
633 | int offset, transfer, blks; | 633 | int offset, transfer, blks; |
634 | int result; | 634 | int result; |
@@ -719,7 +719,7 @@ static int flush_buffer(struct scsi_tape *STp, int seek_next) | |||
719 | return 0; | 719 | return 0; |
720 | STps = &(STp->ps[STp->partition]); | 720 | STps = &(STp->ps[STp->partition]); |
721 | if (STps->rw == ST_WRITING) /* Writing */ | 721 | if (STps->rw == ST_WRITING) /* Writing */ |
722 | return flush_write_buffer(STp); | 722 | return st_flush_write_buffer(STp); |
723 | 723 | ||
724 | if (STp->block_size == 0) | 724 | if (STp->block_size == 0) |
725 | return 0; | 725 | return 0; |
@@ -1214,7 +1214,7 @@ static int st_flush(struct file *filp, fl_owner_t id) | |||
1214 | return 0; | 1214 | return 0; |
1215 | 1215 | ||
1216 | if (STps->rw == ST_WRITING && !STp->pos_unknown) { | 1216 | if (STps->rw == ST_WRITING && !STp->pos_unknown) { |
1217 | result = flush_write_buffer(STp); | 1217 | result = st_flush_write_buffer(STp); |
1218 | if (result != 0 && result != (-ENOSPC)) | 1218 | if (result != 0 && result != (-ENOSPC)) |
1219 | goto out; | 1219 | goto out; |
1220 | } | 1220 | } |