summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-04-14 17:17:16 +0300
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-04-16 09:23:46 -0500
commit8ef8d5941cdc6ab616334e14306c39f7aceb780c (patch)
treeb03ff1ce50d7ebe271d22b7c46a00505a334cef0 /drivers/scsi
parentb312bab3b961de21c5a98bd70e04070eaa61817c (diff)
downloadop-kernel-dev-8ef8d5941cdc6ab616334e14306c39f7aceb780c.zip
op-kernel-dev-8ef8d5941cdc6ab616334e14306c39f7aceb780c.tar.gz
[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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index d204aad..df83bea 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)
/* 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;
@@ -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;
@@ -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;
}
OpenPOWER on IntegriCloud