[PATCH] Update server filelayout devicelist to
Andy Adamson
andros at umich.edu
Wed Jun 6 10:28:45 EDT 2007
draft-ietf-nfsv4-minorversion1-10
Remove the layout type from the server filelayout device list
Signed-off by: Andy Adamson <andros at citi.umich.edu>
---
fs/nfsd/nfs4filelayoutxdr.c | 2 --
include/linux/nfsd/nfs4layoutxdr.h | 1 -
2 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/nfs4filelayoutxdr.c b/fs/nfsd/nfs4filelayoutxdr.c
index 68ea45d..63198e7 100644
--- a/fs/nfsd/nfs4filelayoutxdr.c
+++ b/fs/nfsd/nfs4filelayoutxdr.c
@@ -92,7 +92,6 @@ filelayout_encode_layoutlist_item(u32 *p, u32 *end, struct
nfsd4_pnfs_layoutlist
len = 16 + fhlen;
if (p + XDR_QUADLEN(len) > end)
return -ENOMEM;
- WRITE32(item->dev_layout_type);
WRITE32(item->dev_id);
WRITE32(item->dev_index);
WRITE32(fhlen);
@@ -128,7 +127,6 @@ filelayout_encode_layout(u32 *p, u32 *end, void *layout)
WRITE32(flp->lg_llistlen);
for (i=0; i < flp->lg_llistlen; i++) {
item = &flp->lg_llist[i];
- item->dev_layout_type = flp->lg_layout_type;
len = filelayout_encode_layoutlist_item(p, end, item);
if (len > 0) {
p += XDR_QUADLEN(len);
diff --git a/include/linux/nfsd/nfs4layoutxdr.h
b/include/linux/nfsd/nfs4layoutxdr.h
index 9f69431..25cde5f 100644
--- a/include/linux/nfsd/nfs4layoutxdr.h
+++ b/include/linux/nfsd/nfs4layoutxdr.h
@@ -64,7 +64,6 @@ struct pnfs_filelayout_devaddr {
};
struct nfsd4_pnfs_layoutlist {
- u32 dev_layout_type;
u32 dev_id;
u32 dev_index;
struct knfsd_fh dev_fh;
--
1.5.0.2
> From: Marc Eshel <eshel at almaden.ibm.com>
> >
> >
> > ---
> >
> > fs/nfsd/nfs4filelayoutxdr.c | 1 -
> > 1 files changed, 0 insertions(+), 1 deletions(-)
> >
> > diff --git a/fs/nfsd/nfs4filelayoutxdr.c b/fs/nfsd/nfs4filelayoutxdr.c
> > index 68ea45d..2d0daad 100644
> > --- a/fs/nfsd/nfs4filelayoutxdr.c
> > +++ b/fs/nfsd/nfs4filelayoutxdr.c
> > @@ -92,7 +92,6 @@ filelayout_encode_layoutlist_item(u32 *p
> > len = 16 + fhlen;
> > if (p + XDR_QUADLEN(len) > end)
> > return -ENOMEM;
> > - WRITE32(item->dev_layout_type);
> > WRITE32(item->dev_id);
> > WRITE32(item->dev_index);
> > WRITE32(fhlen);
> > _______________________________________________
> > pNFS mailing list
> > pNFS at linux-nfs.org
> > http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
>
------=_Part_21012_24491469.1181140559571
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
<br><br><div><span class="gmail_quote">On 6/5/07, <b class="gmail_sendername">Marc Eshel</b> <<a href="mailto:eshel at almaden.ibm.com">eshel at almaden.ibm.com</a>> wrote:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br><tt><font size="2">Andy, please update the git with the corresponding
fix on the server side.</font></tt>
<br><tt><font size="2">Thanks, Marc.</font></tt></blockquote><div><br><br>sorry not to have done this with the client side...<br><br>this patch is pushed to the master branch<br><br>-->Andy<br><br>From 21ea95d098e20662992c9e4f975ca998a3027878 Mon Sep 17 00:00:00 2001
<br>From: Andy Adamson <<a href="mailto:andros at umich.edu">andros at umich.edu</a>><br>Date: Wed, 6 Jun 2007 10:28:45 -0400<br>Subject: [PATCH] Update server filelayout devicelist to draft-ietf-nfsv4-minorversion1-10<br>
<br>Remove the layout type from the server filelayout device list<br><br>Signed-off by: Andy Adamson <<a href="mailto:andros at citi.umich.edu">andros at citi.umich.edu</a>><br>---<br> fs/nfsd/nfs4filelayoutxdr.c | 2 --
<br> include/linux/nfsd/nfs4layoutxdr.h | 1 -<br> 2 files changed, 0 insertions(+), 3 deletions(-)<br><br>diff --git a/fs/nfsd/nfs4filelayoutxdr.c b/fs/nfsd/nfs4filelayoutxdr.c<br>index 68ea45d..63198e7 100644<br>--- a/fs/nfsd/nfs4filelayoutxdr.c
<br>+++ b/fs/nfsd/nfs4filelayoutxdr.c<br>@@ -92,7 +92,6 @@ filelayout_encode_layoutlist_item(u32 *p, u32 *end, struct nfsd4_pnfs_layoutlist<br> len = 16 + fhlen;<br> if (p + XDR_QUADLEN(len) > end)<br> return -ENOMEM;
<br>- WRITE32(item->dev_layout_type);<br> WRITE32(item->dev_id);<br> WRITE32(item->dev_index);<br> WRITE32(fhlen);<br>@@ -128,7 +127,6 @@ filelayout_encode_layout(u32 *p, u32 *end, void *layout)
<br> WRITE32(flp->lg_llistlen);<br> for (i=0; i < flp->lg_llistlen; i++) {<br> item = &flp->lg_llist[i];<br>- item->dev_layout_type = flp->lg_layout_type;<br>
len = filelayout_encode_layoutlist_item(p, end, item);<br> if (len > 0) {<br> p += XDR_QUADLEN(len);<br>diff --git a/include/linux/nfsd/nfs4layoutxdr.h b/include/linux/nfsd/nfs4layoutxdr.h
<br>index 9f69431..25cde5f 100644<br>--- a/include/linux/nfsd/nfs4layoutxdr.h<br>+++ b/include/linux/nfsd/nfs4layoutxdr.h<br>@@ -64,7 +64,6 @@ struct pnfs_filelayout_devaddr {<br> };<br><br> struct nfsd4_pnfs_layoutlist {
<br>- u32 dev_layout_type;<br> u32 dev_id;<br> u32 dev_index;<br> struct knfsd_fh dev_fh;<br>--
<br><a href="http://1.5.0.2">1.5.0.2</a><br><br></div><br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div><span class="e" id="q_112fd7dbdfeb6968_1">
<tt><font size="2">
> From: Marc Eshel <<a href="mailto:eshel at almaden.ibm.com" target="_blank" onclick="return top.js.OpenExtLink(window,event,this)">eshel at almaden.ibm.com</a>><br>
> <br>
> <br>
> ---<br>
> <br>
> fs/nfsd/nfs4filelayoutxdr.c | 1 -<br>
> 1 files changed, 0 insertions(+), 1 deletions(-)<br>
> <br>
> diff --git a/fs/nfsd/nfs4filelayoutxdr.c b/fs/nfsd/nfs4filelayoutxdr.c<br>
> index 68ea45d..2d0daad 100644<br>
> --- a/fs/nfsd/nfs4filelayoutxdr.c<br>
> +++ b/fs/nfsd/nfs4filelayoutxdr.c<br>
> @@ -92,7 +92,6 @@ filelayout_encode_layoutlist_item(u32 *p<br>
> len = 16 + fhlen;<br>
> if (p + XDR_QUADLEN(len) > end)<br>
> return -ENOMEM;<br>
> - WRITE32(item->dev_layout_type);<br>
> WRITE32(item->dev_id);<br>
> WRITE32(item->dev_index);<br>
> WRITE32(fhlen);<br></font></tt></span></div><tt><font size="2">
> _______________________________________________<br>
> pNFS mailing list<br>
> <a href="mailto:pNFS at linux-nfs.org" target="_blank" onclick="return top.js.OpenExtLink(window,event,this)">pNFS at linux-nfs.org</a><br>
> <a href="http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs" target="_blank" onclick="return top.js.OpenExtLink(window,event,this)">http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs</a><br>
</font></tt></blockquote></div><br>
------=_Part_21012_24491469.1181140559571--
More information about the pNFS
mailing list