linux-kernel - [2.6 patch] scsi/st.c: rename flush_write

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20080414141716.GH6695@cs181133002.pp.htv.fi>
Date:	Mon, 14 Apr 2008 17:17:16 +0300
From:	Adrian Bunk <bunk@...nel.org>
To:	James.Bottomley@...senPartnership.com, Kai.Makisara@...umbus.fi
Cc:	linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org
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@...nel.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;
 	}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/