* [PATCH] NFSD: FIDs need to take precedence over UUIDs
@ 2008-02-14 20:58 Steve Dickson
0 siblings, 0 replies; 3+ messages in thread
From: Steve Dickson @ 2008-02-14 20:58 UTC (permalink / raw)
To: Linux NFS Mailing list
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
Talking with Neil and Bruce, it seems somewhere down the
line UUIDs started to taking precedence over the setting
fsid= export option when composing file handles which is wrong.
This patch restores fsids taking precedence over UUIDs during
file handing composing.
steved.
[-- Attachment #2: kernel-2.6.25-nfsd-fid-uuid.patch --]
[-- Type: text/x-patch, Size: 1138 bytes --]
Author: Steve Dickson <steved@redhat.com>
Date: Thu Feb 14 15:48:20 EST 2008
When determining the fsid_type in fh_compose(), the setting of
the FID via fsid= export option needs to take precedence over
using the UUID device id.
Signed-off-by: Steve Dickson <steved@redhat.com>
diff -up linux-2.6.24.i686/fs/nfsd/nfsfh.c.orig linux-2.6.24.i686/fs/nfsd/nfsfh.c
--- linux-2.6.24.i686/fs/nfsd/nfsfh.c.orig 2008-02-14 12:52:46.000000000 -0500
+++ linux-2.6.24.i686/fs/nfsd/nfsfh.c 2008-02-14 14:13:09.000000000 -0500
@@ -410,6 +410,8 @@ fh_compose(struct svc_fh *fhp, struct sv
goto retry;
break;
}
+ } else if (exp->ex_flags & NFSEXP_FSID) {
+ fsid_type = FSID_NUM;
} else if (exp->ex_uuid) {
if (fhp->fh_maxsize >= 64) {
if (root_export)
@@ -422,9 +424,7 @@ fh_compose(struct svc_fh *fhp, struct sv
else
fsid_type = FSID_UUID4_INUM;
}
- } else if (exp->ex_flags & NFSEXP_FSID)
- fsid_type = FSID_NUM;
- else if (!old_valid_dev(ex_dev))
+ } else if (!old_valid_dev(ex_dev))
/* for newer device numbers, we must use a newer fsid format */
fsid_type = FSID_ENCODE_DEV;
else
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] NFSD: FIDs need to take precedence over UUIDs
@ 2009-01-07 21:54 Steve Dickson
[not found] ` <49652496.2000008-AfCzQyP5zfLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Steve Dickson @ 2009-01-07 21:54 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: Linux NFS Mailing list
[ Resent per Bruce's request]
Talking with Neil and Bruce, it seems somewhere down the
line UUIDs started to taking precedence over the setting
fsid= export option when composing file handles which is wrong.
This patch restores fsids taking precedence over UUIDs during
file handing composing.
One side note, this also can be done from mountd.
See "[PATCH 5/9] Dynamic Pseudo Root - Release 3"
(http://linux-nfs.org/pipermail/nfsv4/2008-November/009459.html)
Either way will work...
steved.
Author: Steve Dickson <steved@redhat.com>
Date: Thu Feb 14 15:48:20 EST 2008
When determining the fsid_type in fh_compose(), the setting of
the FID via fsid= export option needs to take precedence over
using the UUID device id.
Signed-off-by: Steve Dickson <steved@redhat.com>
diff -up linux-2.6.24.i686/fs/nfsd/nfsfh.c.orig linux-2.6.24.i686/fs/nfsd/nfsfh.c
--- linux-2.6.24.i686/fs/nfsd/nfsfh.c.orig 2008-02-14 12:52:46.000000000 -0500
+++ linux-2.6.24.i686/fs/nfsd/nfsfh.c 2008-02-14 14:13:09.000000000 -0500
@@ -410,6 +410,8 @@ fh_compose(struct svc_fh *fhp, struct sv
goto retry;
break;
}
+ } else if (exp->ex_flags & NFSEXP_FSID) {
+ fsid_type = FSID_NUM;
} else if (exp->ex_uuid) {
if (fhp->fh_maxsize >= 64) {
if (root_export)
@@ -422,9 +424,7 @@ fh_compose(struct svc_fh *fhp, struct sv
else
fsid_type = FSID_UUID4_INUM;
}
- } else if (exp->ex_flags & NFSEXP_FSID)
- fsid_type = FSID_NUM;
- else if (!old_valid_dev(ex_dev))
+ } else if (!old_valid_dev(ex_dev))
/* for newer device numbers, we must use a newer fsid format */
fsid_type = FSID_ENCODE_DEV;
else
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] NFSD: FIDs need to take precedence over UUIDs
[not found] ` <49652496.2000008-AfCzQyP5zfLQT0dZR+AlfA@public.gmane.org>
@ 2009-01-07 22:23 ` J. Bruce Fields
0 siblings, 0 replies; 3+ messages in thread
From: J. Bruce Fields @ 2009-01-07 22:23 UTC (permalink / raw)
To: Steve Dickson; +Cc: Linux NFS Mailing list
Applied, thanks.--b.
On Wed, Jan 07, 2009 at 04:54:30PM -0500, Steve Dickson wrote:
> [ Resent per Bruce's request]
>
> Talking with Neil and Bruce, it seems somewhere down the
> line UUIDs started to taking precedence over the setting
> fsid= export option when composing file handles which is wrong.
> This patch restores fsids taking precedence over UUIDs during
> file handing composing.
>
> One side note, this also can be done from mountd.
> See "[PATCH 5/9] Dynamic Pseudo Root - Release 3"
> (http://linux-nfs.org/pipermail/nfsv4/2008-November/009459.html)
> Either way will work...
>
> steved.
>
>
> Author: Steve Dickson <steved@redhat.com>
> Date: Thu Feb 14 15:48:20 EST 2008
>
> When determining the fsid_type in fh_compose(), the setting of
> the FID via fsid= export option needs to take precedence over
> using the UUID device id.
>
> Signed-off-by: Steve Dickson <steved@redhat.com>
>
> diff -up linux-2.6.24.i686/fs/nfsd/nfsfh.c.orig linux-2.6.24.i686/fs/nfsd/nfsfh.c
> --- linux-2.6.24.i686/fs/nfsd/nfsfh.c.orig 2008-02-14 12:52:46.000000000 -0500
> +++ linux-2.6.24.i686/fs/nfsd/nfsfh.c 2008-02-14 14:13:09.000000000 -0500
> @@ -410,6 +410,8 @@ fh_compose(struct svc_fh *fhp, struct sv
> goto retry;
> break;
> }
> + } else if (exp->ex_flags & NFSEXP_FSID) {
> + fsid_type = FSID_NUM;
> } else if (exp->ex_uuid) {
> if (fhp->fh_maxsize >= 64) {
> if (root_export)
> @@ -422,9 +424,7 @@ fh_compose(struct svc_fh *fhp, struct sv
> else
> fsid_type = FSID_UUID4_INUM;
> }
> - } else if (exp->ex_flags & NFSEXP_FSID)
> - fsid_type = FSID_NUM;
> - else if (!old_valid_dev(ex_dev))
> + } else if (!old_valid_dev(ex_dev))
> /* for newer device numbers, we must use a newer fsid format */
> fsid_type = FSID_ENCODE_DEV;
> else
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-01-07 22:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-07 21:54 [PATCH] NFSD: FIDs need to take precedence over UUIDs Steve Dickson
[not found] ` <49652496.2000008-AfCzQyP5zfLQT0dZR+AlfA@public.gmane.org>
2009-01-07 22:23 ` J. Bruce Fields
-- strict thread matches above, loose matches on Subject: below --
2008-02-14 20:58 Steve Dickson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox