lkml.org 
[lkml]   [2008]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[2.6 patch] scsi/st.c: 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 -->

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

drivers/scsi/st.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

3b2cc5fd1bf80d197305c4cffcc029046195c8b2 diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 0a52d9d..5b4ab7f 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -626,7 +626,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;
@@ -717,7 +717,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;
@@ -1211,7 +1211,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;
}


\
 
 \ /
  Last update: 2008-04-14 16:23    [W:0.026 / U:0.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site