[CRIU] [PATCH] images: nfs -- Reserve data for NFS support

Cyrill Gorcunov gorcunov at gmail.com
Wed Jun 15 04:58:40 PDT 2016


On Wed, Jun 15, 2016 at 02:42:16PM +0300, Pavel Emelyanov wrote:
> On 06/11/2016 07:00 PM, Cyrill Gorcunov wrote:
> > These entries will be used for NFS support and
> > we already test partial support in vz7 version
> > of criu. So to make images compatible lets reserve
> > some of them in advance.
> > 
> > CC: Pavel Emelyanov <xemul at virtuozzo.com>
> > CC: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
> > Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> > ---
> > 
> > Pavel, please consider merging this patch simply because the
> > development versions of the patches are floating in mailing
> > list and we're already testing them in vz7 version of criu,
> > so while details of the "C" code may be not yet merged the
> > image format better to be sync'ed otherwise we hit troubles
> > with compatibility.
> 
> OK, but
> 
> >  images/mnt.proto     | 3 +++
> >  images/regfile.proto | 2 ++
> >  2 files changed, 5 insertions(+)
> > 
> > diff --git a/images/mnt.proto b/images/mnt.proto
> > index 9338ecbc93a5..9b890c3c2465 100644
> > --- a/images/mnt.proto
> > +++ b/images/mnt.proto
> > @@ -21,6 +21,9 @@ enum fstype {
> >  	OVERLAYFS		= 17;
> >  	AUTOFS			= 18;
> >  	TRACEFS			= 19;
> > +	RPC_PIPEFS		= 20;
> > +	NFS			= 21;
> > +	NFS4			= 22;
> 
> Leave them commented.

OK

> 
> >  };
> >  
> >  message mnt_entry {
> > diff --git a/images/regfile.proto b/images/regfile.proto
> > index e25d58902fd1..f88603eacc6d 100644
> > --- a/images/regfile.proto
> > +++ b/images/regfile.proto
> > @@ -10,4 +10,6 @@ message reg_file_entry {
> >  	optional sint32		mnt_id	= 7 [default = -1];
> >  	optional uint64		size	= 8;
> >  	optional bool		ext	= 9;
> > +	optional uint32         mode    = 10;
> > +	optional bool		unreachable     = 11;
> 
> Drop this hunk.

Stas uses it. If I don't reverve them here we might get clash in future.


More information about the CRIU mailing list