Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ef8d594 authored by Adrian Bunk's avatar Adrian Bunk Committed by James Bottomley
Browse files

[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: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent b312bab3

drivers/scsi/st.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}