Date: Wed, 29 Feb 2012 19:10:12 GMT From: "Jim Carroll" <jim@carroll.com> To: freebsd-fs@FreeBSD.org Subject: Re: kern/165559: ufsmount.h uses the ' export' keyword as a structure member name Message-ID: <201202291910.q1TJACSG087982@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR kern/165559; it has been noted by GNATS.
From: "Jim Carroll" <jim@carroll.com>
To: <bug-followup@FreeBSD.org>
Cc:
Subject: Re: kern/165559: ufsmount.h uses the 'export' keyword as a structure member name
Date: Wed, 29 Feb 2012 13:07:44 -0500
This is a multipart message in MIME format.
------=_NextPart_000_0010_01CCF6E3.2168D7F0
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
WHOOPS - inverted the filenames for our patch. Here is the correct patch
--- /usr/include/ufs/ufs/ufsmount.h 2012-02-29 12:32:28.000000000 -0500
+++ ufsmount.h 2012-02-29 13:07:08.000000000 -0500
@@ -40,7 +40,7 @@
*/
struct ufs_args {
char *fspec; /* block special device to mount */
- struct oexport_args export; /* network export information */
+ struct oexport_args export_; /* network export information */
};
#ifdef _KERNEL
------=_NextPart_000_0010_01CCF6E3.2168D7F0
Content-Type: text/html;
charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
<html xmlns:v=3D"urn:schemas-microsoft-com:vml" =
xmlns:o=3D"urn:schemas-microsoft-com:office:office" =
xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" =
xmlns=3D"http://www.w3.org/TR/REC-html40"><head><meta =
http-equiv=3DContent-Type content=3D"text/html; =
charset=3Dus-ascii"><meta name=3DGenerator content=3D"Microsoft Word 14 =
(filtered medium)"><style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Courier New";}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Courier New";
color:windowtext;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Courier New";}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]--></head><body lang=3DEN-US link=3Dblue =
vlink=3Dpurple><div class=3DWordSection1><p class=3DMsoNormal><span =
style=3D'font-family:"Courier New"'>WHOOPS – inverted the =
filenames for our patch. Here is the correct =
patch<o:p></o:p></span></p><p class=3DMsoNormal><span =
style=3D'font-family:"Courier New"'><o:p> </o:p></span></p><p =
class=3DMsoNormal><span style=3D'font-family:"Courier =
New"'><o:p> </o:p></span></p><p class=3DMsoPlainText>--- =
/usr/include/ufs/ufs/ufsmount.h 2012-02-29 =
12:32:28.000000000 -0500<o:p></o:p></p><p class=3DMsoPlainText>+++ =
ufsmount.h 2012-02-29 13:07:08.000000000 -0500<o:p></o:p></p><p =
class=3DMsoPlainText>@@ -40,7 +40,7 @@<o:p></o:p></p><p =
class=3DMsoPlainText> */<o:p></o:p></p><p class=3DMsoPlainText> =
struct ufs_args {<o:p></o:p></p><p class=3DMsoPlainText> =
char =
*fspec; =
/* block special device to mount */<o:p></o:p></p><p =
class=3DMsoPlainText>- struct =
oexport_args export; /* network export information =
*/<o:p></o:p></p><p class=3DMsoPlainText>+ =
struct oexport_args export_; /* network =
export information */<o:p></o:p></p><p class=3DMsoPlainText> =
};<o:p></o:p></p><p class=3DMsoPlainText> <o:p></o:p></p><p =
class=3DMsoPlainText> #ifdef _KERNEL<o:p></o:p></p><p =
class=3DMsoNormal><o:p> </o:p></p></div></body></html>
------=_NextPart_000_0010_01CCF6E3.2168D7F0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202291910.q1TJACSG087982>