2008-05-09 19:23:22

by J. Bruce Fields

[permalink] [raw]
Subject: stuff

=46rom: J. Bruce Fields <[email protected]>

Commit f15364bd4cf8799a7677b6daeed7b67d9139d974 ("IPv6 support for NFS
server export caches") dropped a couple spaces, rendering the output
here difficult to read.

(However note that we expect the output to be parsed only by humans, no=
t
machines, so this shouldn't have broken any userland software.)

Signed-off-by: J. Bruce Fields <[email protected]>
Cc: Aurelien Charbon <[email protected]>
Cc: Neil Brown <[email protected]>
Cc: Brian Haley <[email protected]>
Cc: YOSHIFUJI Hideaki / =E5=90=89=E8=97=A4=E8=8B=B1=E6=98=8E <yoshfuji=
@linux-ipv6.org>

---
net/sunrpc/svcauth_unix.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

I just noticed this while doing some debugging at Connectathon. I'm
undecided whether to take it seriously. Does anyone other than me use
these /content files? I suppose it should probably go into 2.6.26 but
not 2.6.25.x.

--b.

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 3f30ee6..f24800f 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -278,7 +278,7 @@ static int ip_map_show(struct seq_file *m,
dom =3D im->m_client->h.name;
=20
if (ipv6_addr_v4mapped(&addr)) {
- seq_printf(m, "%s" NIPQUAD_FMT "%s\n",
+ seq_printf(m, "%s " NIPQUAD_FMT " %s\n",
im->m_class,
ntohl(addr.s6_addr32[3]) >> 24 & 0xff,
ntohl(addr.s6_addr32[3]) >> 16 & 0xff,
@@ -286,7 +286,7 @@ static int ip_map_show(struct seq_file *m,
ntohl(addr.s6_addr32[3]) >> 0 & 0xff,
dom);
} else {
- seq_printf(m, "%s" NIP6_FMT "%s\n",
+ seq_printf(m, "%s " NIP6_FMT " %s\n",
im->m_class, NIP6(addr), dom);
}
return 0;
--=20
1.5.5.rc1



2008-05-09 20:48:11

by J. Bruce Fields

[permalink] [raw]
Subject: [PATCH] Fix /proc/net/rpc/auth.unix.ip/content output [Was Re: stuff]

Um, sorry about that subject line.

On Fri, May 09, 2008 at 03:23:19PM -0400, J. Bruce Fields wrote:
> From: J. Bruce Fields <[email protected]>
>=20
> Commit f15364bd4cf8799a7677b6daeed7b67d9139d974 ("IPv6 support for NF=
S
> server export caches") dropped a couple spaces, rendering the output
> here difficult to read.
>=20
> (However note that we expect the output to be parsed only by humans, =
not
> machines, so this shouldn't have broken any userland software.)
>=20
> Signed-off-by: J. Bruce Fields <[email protected]>
> Cc: Aurelien Charbon <[email protected]>
> Cc: Neil Brown <[email protected]>
> Cc: Brian Haley <[email protected]>
> Cc: YOSHIFUJI Hideaki / =E5=90=89=E8=97=A4=E8=8B=B1=E6=98=8E <yoshfu=
[email protected]>
>=20
> ---
> net/sunrpc/svcauth_unix.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>=20
> I just noticed this while doing some debugging at Connectathon. I'm
> undecided whether to take it seriously. Does anyone other than me us=
e
> these /content files? I suppose it should probably go into 2.6.26 bu=
t
> not 2.6.25.x.
>=20
> --b.
>=20
> diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
> index 3f30ee6..f24800f 100644
> --- a/net/sunrpc/svcauth_unix.c
> +++ b/net/sunrpc/svcauth_unix.c
> @@ -278,7 +278,7 @@ static int ip_map_show(struct seq_file *m,
> dom =3D im->m_client->h.name;
> =20
> if (ipv6_addr_v4mapped(&addr)) {
> - seq_printf(m, "%s" NIPQUAD_FMT "%s\n",
> + seq_printf(m, "%s " NIPQUAD_FMT " %s\n",
> im->m_class,
> ntohl(addr.s6_addr32[3]) >> 24 & 0xff,
> ntohl(addr.s6_addr32[3]) >> 16 & 0xff,
> @@ -286,7 +286,7 @@ static int ip_map_show(struct seq_file *m,
> ntohl(addr.s6_addr32[3]) >> 0 & 0xff,
> dom);
> } else {
> - seq_printf(m, "%s" NIP6_FMT "%s\n",
> + seq_printf(m, "%s " NIP6_FMT " %s\n",
> im->m_class, NIP6(addr), dom);
> }
> return 0;
> --=20
> 1.5.5.rc1
>=20
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" =
in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2008-05-12 00:15:27

by NeilBrown

[permalink] [raw]
Subject: Re: [PATCH] Fix /proc/net/rpc/auth.unix.ip/content output [Was Re: stuff]

On Friday May 9, [email protected] wrote:
> Um, sorry about that subject line.

I liked it ;-) Gave a bit of an informal feel....


>=20
> On Fri, May 09, 2008 at 03:23:19PM -0400, J. Bruce Fields wrote:
> > From: J. Bruce Fields <[email protected]>
> >=20
> > Commit f15364bd4cf8799a7677b6daeed7b67d9139d974 ("IPv6 support for =
NFS
> > server export caches") dropped a couple spaces, rendering the outpu=
t
> > here difficult to read.
> >=20
> > (However note that we expect the output to be parsed only by humans=
, not
> > machines, so this shouldn't have broken any userland software.)
> >=20
> > Signed-off-by: J. Bruce Fields <[email protected]>
> > Cc: Aurelien Charbon <[email protected]>
> > Cc: Neil Brown <[email protected]>
> > Cc: Brian Haley <[email protected]>
> > Cc: YOSHIFUJI Hideaki / =E5=90=1B(Ih=1B$(O$h=8B=B1=E6=98=8E=1B(B <=
[email protected]>
> >=20
> > ---
> > net/sunrpc/svcauth_unix.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >=20
> > I just noticed this while doing some debugging at Connectathon. I'=
m
> > undecided whether to take it seriously. Does anyone other than me =
use
> > these /content files? I suppose it should probably go into 2.6.26 =
but
> > not 2.6.25.x.

I don't think any code uses them, but it's very good to be able to
look at them when something doesn't seem to be working as expected.

But I don't think the patch would apply to 2.6.25. 'git name-rev' on
the offending commit say:

f15364bd4cf8799a7677b6daeed7b67d9139d974 tags/v2.6.26-rc1~1083^2~47

which means it was in 2.6.26-rc1 but not the previous release.

NeilBrown

2008-05-12 00:40:29

by J. Bruce Fields

[permalink] [raw]
Subject: Re: [PATCH] Fix /proc/net/rpc/auth.unix.ip/content output [Was Re: stuff]

On Mon, May 12, 2008 at 10:15:15AM +1000, Neil Brown wrote:
> But I don't think the patch would apply to 2.6.25. 'git name-rev' on
> the offending commit say:
>
> f15364bd4cf8799a7677b6daeed7b67d9139d974 tags/v2.6.26-rc1~1083^2~47
>
> which means it was in 2.6.26-rc1 but not the previous release.

Ah! You're right--I lose track of time too easily.

--b.