Skip to contentSkip to conversation

nfs: support 64-bit root inode number in NFS FSID

PATCH In review Dilger, Andreas 5 participants 11 messages May 22, 2013 – Jun 3, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfs: support 64-bit root inode number in NFS FSID

When exporting a filesystem via NFS, it can generate several kinds of NFS filesystem IDs. For most of cases, it uses a 32-bit inode number in the NFS FSID, but this does not work on a filesystem using a 64-bit root inode number.

In kernel space, NFS can generate/use NFS FSID with a 64-bit inode number for the "FSID_UUID16_INUM" type. Unfortunately, while the user space nfs-utils decode the 64-bit inode number from the FSID correctly, it is truncated when storing it in "struct parsed_fsid". Expand the "struct parsed_fsid" inode field to store the full 64-bit root inode number.

Intel-bug-id: LU-2904

---
 utils/mountd/cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
utils/mountd/cache.c +1 -1
index 517aa62..a7212e7 100644
@@ -388,7 +388,7 @@ struct parsed_fsid {
 	int fsidtype;
 	/* We could use a union for this, but it would be more
 	 * complicated; why bother? */
-	unsigned int inode;
+	unsigned long long inode; /* We need 64-bits ino# */
 	unsigned int minor;
 	unsigned int major;
 	unsigned int fsidnum;

--1.7.1

Patch is also attached separately, since it will likely be butchered by this email client.

Cheers, Andreas

Signature · 4 lines
Andreas Dilger

Lustre Software Architect
Intel High Performance Data Division

From bebf55d991322c72d5b09b216c776ab0387c043e Mon Sep 17 00:00:00 2001
From: Fan Yong <[email protected]>
Date: Mon, 13 May 2013 13:53:42 +0800
Subject: [PATCH] nfs: support 64-bit root inode number in NFS FSID

When exporting a filesystem via NFS, it can generate several kinds of NFS filesystem IDs. For most of cases, it uses a 32-bit inode number in the NFS FSID, but this does not work on a filesystem using a 64-bit root inode number.

In kernel space, NFS can generate/use NFS FSID with a 64-bit inode number for the "FSID_UUID16_INUM" type. Unfortunately, while the user space nfs-utils decode the 64-bit inode number from the FSID correctly, it is truncated when storing it in "struct parsed_fsid". Expand the "struct parsed_fsid" inode field to store the full 64-bit root inode number.

Intel-bug-id: LU-2904

---
 utils/mountd/cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
utils/mountd/cache.c +1 -1
index 517aa62..a7212e7 100644
@@ -388,7 +388,7 @@ struct parsed_fsid {
 	int fsidtype;
 	/* We could use a union for this, but it would be more
 	 * complicated; why bother? */
-	unsigned int inode;
+	unsigned long long inode; /* We need 64-bits ino# */
 	unsigned int minor;
 	unsigned int major;
 	unsigned int fsidnum;
Signature · 1 line
1.7.1
#1 lore raw

[nfs-utils patch needs to be sent to Steve Dickson (CC'ed)]

Quoted 46 lines · Andreas

When exporting a filesystem via NFS, it can generate several kinds of NFS filesystem IDs. For most of cases, it uses a 32-bit inode number in the NFS FSID, but this does not work on a filesystem using a 64-bit root inode number.

In kernel space, NFS can generate/use NFS FSID with a 64-bit inode number for the "FSID_UUID16_INUM" type. Unfortunately, while the user space nfs-utils decode the 64-bit inode number from the FSID correctly, it is truncated when storing it in "struct parsed_fsid". Expand the "struct parsed_fsid" inode field to store the full 64-bit root inode number.

Intel-bug-id: LU-2904

---
 utils/mountd/cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
utils/mountd/cache.c +1 -2
index 517aa62..a7212e7 100644
@@ -388,7 +388,7 @@ struct parsed_fsid {
        int fsidtype;
        /* We could use a union for this, but it would be more
         * complicated; why bother? */
-       unsigned int inode;
+       unsigned long long inode; /* We need 64-bits ino# */
        unsigned int minor;
        unsigned int major;
        unsigned int fsidnum;
--1.7.1

Patch is also attached separately, since it will likely be butchered by this email client.

Cheers, Andreas
--
Andreas Dilger

Lustre Software Architect
Intel High Performance Data Division

#2 lore raw
Quoted 38 lines · Peng Tao

[nfs-utils patch needs to be sent to Steve Dickson (CC'ed)]

Quoted 34 lines · Andreas

When exporting a filesystem via NFS, it can generate several kinds of NFS filesystem IDs. For most of cases, it uses a 32-bit inode number in the NFS FSID, but this does not work on a filesystem using a 64-bit root inode number.

In kernel space, NFS can generate/use NFS FSID with a 64-bit inode number for the "FSID_UUID16_INUM" type. Unfortunately, while the user space nfs-utils decode the 64-bit inode number from the FSID correctly, it is truncated when storing it in "struct parsed_fsid". Expand the "struct parsed_fsid" inode field to store the full 64-bit root inode number.

Intel-bug-id: LU-2904

---
 utils/mountd/cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
utils/mountd/cache.c +1 -2
index 517aa62..a7212e7 100644
@@ -388,7 +388,7 @@ struct parsed_fsid {
        int fsidtype;
        /* We could use a union for this, but it would be more
         * complicated; why bother? */
-       unsigned int inode;
+       unsigned long long inode; /* We need 64-bits ino# */
        unsigned int minor;
        unsigned int major;
        unsigned int fsidnum;
--1.7.1
Quoted 7 lines
Quoted 7 lines

Patch is also attached separately, since it will likely be butchered by this email client.

Cheers, Andreas
--
Andreas Dilger

Why not just specify a uint64_t size then?

Signature · 6 lines
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com
#3 lore raw

Just make it match the "inode64" in nfs-utils parse_fsid(), which is defined as "unsigned long long", and the parsed_fsid:: inode is copied from "inode64" as following:

static int parse_fsid(int fsidtype, int fsidlen, char *fsid,
struct parsed_fsid *parsed)

{
        unsigned int dev;
        unsigned long long inode64;
...
        case FSID_UUID16_INUM: /* 8 byte inode number and 16 byte uuid */
                if (fsidlen != 24)
                        return -1;
                memcpy(&inode64, fsid, 8);
                parsed->inode = inode64;
                parsed->uuidlen = 16;
                parsed->fhuuid = fsid+8;
                break;
        }

--
Cheers,
Nasf

-----Original Message-----
From: Myklebust, Trond [mailto:[email protected]]
Sent: Thursday, May 23, 2013 8:50 PM
To: Peng Tao
Cc: Dilger, Andreas; J. Bruce Fields; [email protected]; Yong, Fan; Steve Dickson
Subject: Re: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Quoted 38 lines · Peng Tao

[nfs-utils patch needs to be sent to Steve Dickson (CC'ed)]

Quoted 34 lines · Andreas

When exporting a filesystem via NFS, it can generate several kinds of NFS filesystem IDs. For most of cases, it uses a 32-bit inode number in the NFS FSID, but this does not work on a filesystem using a 64-bit root inode number.

In kernel space, NFS can generate/use NFS FSID with a 64-bit inode number for the "FSID_UUID16_INUM" type. Unfortunately, while the user space nfs-utils decode the 64-bit inode number from the FSID correctly, it is truncated when storing it in "struct parsed_fsid". Expand the "struct parsed_fsid" inode field to store the full 64-bit root inode number.

Intel-bug-id: LU-2904

---
 utils/mountd/cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
utils/mountd/cache.c index renamed from utils/mountd/cache.c +0 -0

517aa62..a7212e7 100644

utils/mountd/cache.c +1 -2
@@ -388,7 +388,7 @@ struct parsed_fsid {
        int fsidtype;
        /* We could use a union for this, but it would be more
         * complicated; why bother? */
-       unsigned int inode;
+       unsigned long long inode; /* We need 64-bits ino# */
        unsigned int minor;
        unsigned int major;
        unsigned int fsidnum;
--1.7.1
Quoted 7 lines
Quoted 7 lines

Patch is also attached separately, since it will likely be butchered by this email client.

Cheers, Andreas
--
Andreas Dilger

Why not just specify a uint64_t size then?

--
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com

#4 lore raw
Quoted 18 lines · Fan

Just make it match the "inode64" in nfs-utils parse_fsid(), which is defined as "unsigned long long", and the parsed_fsid:: inode is copied from "inode64" as following:

static int parse_fsid(int fsidtype, int fsidlen, char *fsid,
struct parsed_fsid *parsed)

{
        unsigned int dev;
        unsigned long long inode64;
...
        case FSID_UUID16_INUM: /* 8 byte inode number and 16 byte uuid */
                if (fsidlen != 24)
                        return -1;
                memcpy(&inode64, fsid, 8);
                parsed->inode = inode64;
                parsed->uuidlen = 16;
                parsed->fhuuid = fsid+8;
                break;
        }
Quoted 3 lines

--
Cheers,
Nasf

Eeeeeeeewww! This is _exactly_ why we should be using properly dimensioned types. Feel free to tell me how the value of 'inode64' is well defined on systems where sizeof(unsigned long long) != 8...

Trond

Quoted 67 lines

-----Original Message-----
From: Myklebust, Trond [mailto:[email protected]]
Sent: Thursday, May 23, 2013 8:50 PM
To: Peng Tao
Cc: Dilger, Andreas; J. Bruce Fields; [email protected]; Yong, Fan; Steve Dickson
Subject: Re: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Quoted 38 lines · Peng Tao

[nfs-utils patch needs to be sent to Steve Dickson (CC'ed)]

Quoted 34 lines · Andreas

When exporting a filesystem via NFS, it can generate several kinds of NFS filesystem IDs. For most of cases, it uses a 32-bit inode number in the NFS FSID, but this does not work on a filesystem using a 64-bit root inode number.

In kernel space, NFS can generate/use NFS FSID with a 64-bit inode number for the "FSID_UUID16_INUM" type. Unfortunately, while the user space nfs-utils decode the 64-bit inode number from the FSID correctly, it is truncated when storing it in "struct parsed_fsid". Expand the "struct parsed_fsid" inode field to store the full 64-bit root inode number.

Intel-bug-id: LU-2904

---
 utils/mountd/cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
utils/mountd/cache.c index renamed from utils/mountd/cache.c +0 -0

517aa62..a7212e7 100644

utils/mountd/cache.c +1 -2
@@ -388,7 +388,7 @@ struct parsed_fsid {
        int fsidtype;
        /* We could use a union for this, but it would be more
         * complicated; why bother? */
-       unsigned int inode;
+       unsigned long long inode; /* We need 64-bits ino# */
        unsigned int minor;
        unsigned int major;
        unsigned int fsidnum;
--1.7.1
Quoted 7 lines
Quoted 7 lines

Patch is also attached separately, since it will likely be butchered by this email client.

Cheers, Andreas
--
Andreas Dilger

Why not just specify a uint64_t size then?

--
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com
--
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

Signature · 6 lines
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com
#5 lore raw

Myklebust, Trond wrote:

  On Thu, 2013-05-23 at 12:59 +0000, Yong, Fan wrote:
  > Just make it match the "inode64" in nfs-utils parse_fsid(), which is defined as "unsigned long long", and the parsed_fsid:: inode is copied from "inode64" as following:
  > 
  > static int parse_fsid(int fsidtype, int fsidlen, char *fsid,
  >                 struct parsed_fsid *parsed)
  > {
  >         unsigned int dev;
  >         unsigned long long inode64;
  > ...
  >         case FSID_UUID16_INUM: /* 8 byte inode number and 16 byte uuid */
  >                 if (fsidlen != 24)
  >                         return -1;
  >                 memcpy(&inode64, fsid, 8);
  >                 parsed->inode = inode64;
  >                 parsed->uuidlen = 16;
  >                 parsed->fhuuid = fsid+8;
  >                 break;
  >         }
  > 
  > --
  > Cheers,
  > Nasf

Eeeeeeeewww! This is _exactly_ why we should be using properly dimensioned types. Feel free to tell me how the value of 'inode64' is well defined on systems where sizeof(unsigned long long) != 8...

Is there any reason not to use ino_t?

#6 lore raw
Quoted 36 lines

-----Original Message-----
From: Jim Rees [mailto:[email protected]]
Sent: Thursday, May 23, 2013 10:20 AM
To: Myklebust, Trond
Cc: Yong, Fan; Peng Tao; Dilger, Andreas; J. Bruce Fields; linux- [email protected]; Steve Dickson
Subject: Re: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Myklebust, Trond wrote:

Quoted 1 line · Fan

Just make it match the "inode64" in nfs-utils parse_fsid(), which is defined

as "unsigned long long", and the parsed_fsid:: inode is copied from "inode64" as following:

Quoted 8 lines

static int parse_fsid(int fsidtype, int fsidlen, char *fsid,
struct parsed_fsid *parsed)

{
        unsigned int dev;
        unsigned long long inode64;

...
case FSID_UUID16_INUM: /* 8 byte inode number and 16 byte uuid

*/

Quoted 9 lines
                if (fsidlen != 24)
                        return -1;
                memcpy(&inode64, fsid, 8);
                parsed->inode = inode64;
                parsed->uuidlen = 16;
                parsed->fhuuid = fsid+8;
                break;
        }
Quoted 3 lines

--
Cheers,
Nasf

Quoted 5 lines

Eeeeeeeewww! This is _exactly_ why we should be using properly dimensioned types. Feel free to tell me how the value of 'inode64' is well defined on systems where sizeof(unsigned long long) != 8...

Is there any reason not to use ino_t?

Yes. It's not guaranteed to be 64-bit either.

Trond

#7 lore raw

For the rare unfortunate cases of "sizeof(unsigned long) < 4" or "sizeof(unsigned long long) < 8", current nfs-utils will cross-boundary memory copy. So need more work to make it stably runnable on kinds of platform...

--
Cheers,
Nasf

-----Original Message-----
From: Myklebust, Trond [mailto:[email protected]]
Sent: Thursday, May 23, 2013 10:22 PM
To: Jim Rees
Cc: Yong, Fan; Peng Tao; Dilger, Andreas; J. Bruce Fields; [email protected]; Steve Dickson
Subject: RE: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Quoted 36 lines

-----Original Message-----
From: Jim Rees [mailto:[email protected]]
Sent: Thursday, May 23, 2013 10:20 AM
To: Myklebust, Trond
Cc: Yong, Fan; Peng Tao; Dilger, Andreas; J. Bruce Fields; linux- [email protected]; Steve Dickson
Subject: Re: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Myklebust, Trond wrote:

Quoted 1 line · Fan

Just make it match the "inode64" in nfs-utils parse_fsid(), which

is defined as "unsigned long long", and the parsed_fsid:: inode is copied from "inode64" as following:

Quoted 8 lines

static int parse_fsid(int fsidtype, int fsidlen, char *fsid,
struct parsed_fsid *parsed)

{
        unsigned int dev;
        unsigned long long inode64;

...
case FSID_UUID16_INUM: /* 8 byte inode number and 16 byte uuid

*/

Quoted 9 lines
                if (fsidlen != 24)
                        return -1;
                memcpy(&inode64, fsid, 8);
                parsed->inode = inode64;
                parsed->uuidlen = 16;
                parsed->fhuuid = fsid+8;
                break;
        }
Quoted 3 lines

--
Cheers,
Nasf

Quoted 5 lines

Eeeeeeeewww! This is _exactly_ why we should be using properly dimensioned types. Feel free to tell me how the value of 'inode64' is well defined on systems where sizeof(unsigned long long) != 8...

Is there any reason not to use ino_t?

Yes. It's not guaranteed to be 64-bit either.

Trond

#8 lore raw
Quoted 8 lines

-----Original Message-----
From: Yong, Fan [mailto:[email protected]]
Sent: Thursday, May 23, 2013 9:30 PM
To: Myklebust, Trond; Jim Rees
Cc: Peng Tao; Dilger, Andreas; J. Bruce Fields; [email protected]; Steve Dickson
Subject: RE: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Quoted 4 lines

For the rare unfortunate cases of "sizeof(unsigned long) < 4" or "sizeof(unsigned long long) < 8", current nfs-utils will cross-boundary memory copy. So need more work to make it stably runnable on kinds of platform...

unsigned long long is guaranteed by C99 to be >= 64 bits. IOW: it could be 128 bits depending on the compiler.

Quoted 58 lines

--
Cheers,
Nasf

-----Original Message-----
From: Myklebust, Trond [mailto:[email protected]]
Sent: Thursday, May 23, 2013 10:22 PM
To: Jim Rees
Cc: Yong, Fan; Peng Tao; Dilger, Andreas; J. Bruce Fields; linux- [email protected]; Steve Dickson
Subject: RE: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Quoted 8 lines

-----Original Message-----
From: Jim Rees [mailto:[email protected]]
Sent: Thursday, May 23, 2013 10:20 AM
To: Myklebust, Trond
Cc: Yong, Fan; Peng Tao; Dilger, Andreas; J. Bruce Fields; linux- [email protected]; Steve Dickson
Subject: Re: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Quoted 5 lines

Myklebust, Trond wrote:

Quoted 1 line · Fan

Just make it match the "inode64" in nfs-utils parse_fsid(), which

is defined as "unsigned long long", and the parsed_fsid:: inode is copied

from "inode64"

Quoted 23 lines

as following:

Quoted 8 lines

static int parse_fsid(int fsidtype, int fsidlen, char *fsid,
struct parsed_fsid *parsed)

{
        unsigned int dev;
        unsigned long long inode64;

...
case FSID_UUID16_INUM: /* 8 byte inode number and 16 byte uuid

*/

Quoted 9 lines
                if (fsidlen != 24)
                        return -1;
                memcpy(&inode64, fsid, 8);
                parsed->inode = inode64;
                parsed->uuidlen = 16;
                parsed->fhuuid = fsid+8;
                break;
        }
Quoted 3 lines

--
Cheers,
Nasf

Quoted 5 lines

Eeeeeeeewww! This is _exactly_ why we should be using properly dimensioned types. Feel free to tell me how the value of 'inode64' is well defined on systems where sizeof(unsigned long long) != 8...

Is there any reason not to use ino_t?

Yes. It's not guaranteed to be 64-bit either.

Trond

#9 lore raw
In reply to Myklebust, Trond

Update the patch as suggested.

--
Cheers,
Nasf

-----Original Message-----
From: Myklebust, Trond [mailto:[email protected]]
Sent: Thursday, May 23, 2013 8:50 PM
To: Peng Tao
Cc: Dilger, Andreas; J. Bruce Fields; [email protected]; Yong, Fan; Steve Dickson
Subject: Re: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Quoted 38 lines · Peng Tao

[nfs-utils patch needs to be sent to Steve Dickson (CC'ed)]

Quoted 34 lines · Andreas

When exporting a filesystem via NFS, it can generate several kinds of NFS filesystem IDs. For most of cases, it uses a 32-bit inode number in the NFS FSID, but this does not work on a filesystem using a 64-bit root inode number.

In kernel space, NFS can generate/use NFS FSID with a 64-bit inode number for the "FSID_UUID16_INUM" type. Unfortunately, while the user space nfs-utils decode the 64-bit inode number from the FSID correctly, it is truncated when storing it in "struct parsed_fsid". Expand the "struct parsed_fsid" inode field to store the full 64-bit root inode number.

Intel-bug-id: LU-2904

---
 utils/mountd/cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
utils/mountd/cache.c index renamed from utils/mountd/cache.c +0 -0

517aa62..a7212e7 100644

utils/mountd/cache.c +1 -2
@@ -388,7 +388,7 @@ struct parsed_fsid {
        int fsidtype;
        /* We could use a union for this, but it would be more
         * complicated; why bother? */
-       unsigned int inode;
+       unsigned long long inode; /* We need 64-bits ino# */
        unsigned int minor;
        unsigned int major;
        unsigned int fsidnum;
--1.7.1
Quoted 7 lines
Quoted 7 lines

Patch is also attached separately, since it will likely be butchered by this email client.

Cheers, Andreas
--
Andreas Dilger

Why not just specify a uint64_t size then?

--
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com

#10 lore raw
In reply to Myklebust, Trond

Update the patch as suggested. Here is the patch...

--
Cheers,
Nasf

-----Original Message-----
From: Myklebust, Trond [mailto:[email protected]]
Sent: Thursday, May 23, 2013 8:50 PM
To: Peng Tao
Cc: Dilger, Andreas; J. Bruce Fields; [email protected]; Yong, Fan; Steve Dickson
Subject: Re: [PATCH] nfs: support 64-bit root inode number in NFS FSID

Quoted 38 lines · Peng Tao

[nfs-utils patch needs to be sent to Steve Dickson (CC'ed)]

Quoted 34 lines · Andreas

When exporting a filesystem via NFS, it can generate several kinds of NFS filesystem IDs. For most of cases, it uses a 32-bit inode number in the NFS FSID, but this does not work on a filesystem using a 64-bit root inode number.

In kernel space, NFS can generate/use NFS FSID with a 64-bit inode number for the "FSID_UUID16_INUM" type. Unfortunately, while the user space nfs-utils decode the 64-bit inode number from the FSID correctly, it is truncated when storing it in "struct parsed_fsid". Expand the "struct parsed_fsid" inode field to store the full 64-bit root inode number.

Intel-bug-id: LU-2904

---
 utils/mountd/cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
utils/mountd/cache.c index renamed from utils/mountd/cache.c +0 -0

517aa62..a7212e7 100644

utils/mountd/cache.c +1 -2
@@ -388,7 +388,7 @@ struct parsed_fsid {
        int fsidtype;
        /* We could use a union for this, but it would be more
         * complicated; why bother? */
-       unsigned int inode;
+       unsigned long long inode; /* We need 64-bits ino# */
        unsigned int minor;
        unsigned int major;
        unsigned int fsidnum;
--1.7.1
Quoted 7 lines
Quoted 7 lines

Patch is also attached separately, since it will likely be butchered by this email client.

Cheers, Andreas
--
Andreas Dilger

Why not just specify a uint64_t size then?

--
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com

From 606d7b43be841773bf1d342d6de0267c8bb0b45e Mon Sep 17 00:00:00 2001
From: Fan Yong <[email protected]>
Date: Mon, 13 May 2013 13:53:42 +0800
Subject: [PATCH] nfs: support 64-bit root inode number in NFS FSID

When exporting a filesystem via NFS, it can generate several kinds of NFS filesystem IDs. For most of cases, it uses a 32-bit inode number in the NFS FSID, but this does not work on a filesystem using a 64-bit root inode number.

In kernel space, NFS can generate/use NFS FSID with a 64-bit inode number for the "FSID_UUID16_INUM" type. Unfortunately, while the user space nfs-utils decode the 64-bit inode number from the FSID correctly, it is truncated when storing it in "struct parsed_fsid". Expand the "struct parsed_fsid" inode field to store the full 64-bit root inode number.

Intel-bug-id: LU-2904

---
 utils/mountd/cache.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
utils/mountd/cache.c +2 -2
index 517aa62..be99b7d 100644
@@ -385,10 +385,10 @@ static bool subexport(struct exportent *e1, struct exportent *e2)
 }
 
 struct parsed_fsid {
+	uint64_t inode; /* We need 64-bits ino# */
 	int fsidtype;
 	/* We could use a union for this, but it would be more
 	 * complicated; why bother? */
-	unsigned int inode;
 	unsigned int minor;
 	unsigned int major;
 	unsigned int fsidnum;
@@ -400,7 +400,7 @@ static int parse_fsid(int fsidtype, int fsidlen, char *fsid,
 		struct parsed_fsid *parsed)
 {
 	unsigned int dev;
-	unsigned long long inode64;
+	uint64_t inode64;
 
 	memset(parsed, 0, sizeof(*parsed));
 	parsed->fsidtype = fsidtype;
Signature · 1 line
1.7.1