[PATCH] fs/seq_file.c: Rename the "Fill" label to avoid build failure

[PATCH] fs/seq_file.c: Rename the "Fill" label to avoid build failure

[Huacai Chen]

MIPS define a "Fill" macro as a cache operation in cacheops.h, this
will cause build failure under some special configurations. To avoid
this failure we rename the "Fill" label in seq_file.c.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
 fs/seq_file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 70f5fdf..4e6c56be 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -213,7 +213,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
 			continue;
 		}
 		if (m->count < m->size)
-			goto Fill;
+			goto Fillbuf;
 		m->op->stop(m, p);
 		kvfree(m->buf);
 		m->count = 0;
@@ -225,7 +225,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
 	m->op->stop(m, p);
 	m->count = 0;
 	goto Done;
-Fill:
+Fillbuf:
 	/* they want more? let's try to get some more */
 	while (1) {
 		size_t offs = m->count;
-- 
2.7.0

Re: [PATCH] fs/seq_file.c: Rename the "Fill" label to avoid build failure

[Matthew Wilcox]

On Fri, Apr 24, 2020 at 04:29:04PM +0800, Huacai Chen wrote:
> MIPS define a "Fill" macro as a cache operation in cacheops.h, this
> will cause build failure under some special configurations. To avoid
> this failure we rename the "Fill" label in seq_file.c.

You should rename the Fill macro in the mips header instead.
I'd suggest Fill_R4000 of R4000_Fill.

Re: [PATCH] fs/seq_file.c: Rename the "Fill" label to avoid build failure

[Huacai Chen]

Hi, Matthew,

Thank you for your comments,

On Fri, Apr 24, 2020 at 7:27 PM Matthew Wilcox <willy@infradead.org> wrote:
>
> On Fri, Apr 24, 2020 at 04:29:04PM +0800, Huacai Chen wrote:
> > MIPS define a "Fill" macro as a cache operation in cacheops.h, this
> > will cause build failure under some special configurations. To avoid
> > this failure we rename the "Fill" label in seq_file.c.
>
> You should rename the Fill macro in the mips header instead.
> I'd suggest Fill_R4000 of R4000_Fill.

Hi, Thomas,

What do you think about this? If you agree to rename the "Fill" macro
in cacheops.h, I want to rename it to Fill_I, because it has the same
coding style as other cache operations in cacheops.h.

Thanks,
Huacai

Re: [PATCH] fs/seq_file.c: Rename the "Fill" label to avoid build failure

[Thomas Bogendoerfer]

On Sat, Apr 25, 2020 at 10:54:23AM +0800, Huacai Chen wrote:
> On Fri, Apr 24, 2020 at 7:27 PM Matthew Wilcox <willy@infradead.org> wrote:
> >
> > On Fri, Apr 24, 2020 at 04:29:04PM +0800, Huacai Chen wrote:
> > > MIPS define a "Fill" macro as a cache operation in cacheops.h, this
> > > will cause build failure under some special configurations. To avoid
> > > this failure we rename the "Fill" label in seq_file.c.
> >
> > You should rename the Fill macro in the mips header instead.
> > I'd suggest Fill_R4000 of R4000_Fill.
> 
> What do you think about this? If you agree to rename the "Fill" macro
> in cacheops.h, I want to rename it to Fill_I, because it has the same
> coding style as other cache operations in cacheops.h.

works for me, I've merged your patch to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]