Date: Fri, 28 Apr 2017 21:47:19 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r317571 - projects/pnfs-planb-server/sys/fs/nfsserver Message-ID: <201704282147.v3SLlJQ6079251@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Fri Apr 28 21:47:18 2017 New Revision: 317571 URL: https://svnweb.freebsd.org/changeset/base/317571 Log: Add the pNFS server code updates to nfs_nfsdsocket.c. Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdsocket.c Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdsocket.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdsocket.c Fri Apr 28 21:05:28 2017 (r317570) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdsocket.c Fri Apr 28 21:47:18 2017 (r317571) @@ -182,11 +182,11 @@ int (*nfsrv4_ops0[NFSV41_NOPS])(struct n nfsrvd_destroysession, nfsrvd_freestateid, nfsrvd_notsupp, + nfsrvd_getdevinfo, nfsrvd_notsupp, - nfsrvd_notsupp, - nfsrvd_notsupp, - nfsrvd_notsupp, - nfsrvd_notsupp, + nfsrvd_layoutcommit, + nfsrvd_layoutget, + nfsrvd_layoutreturn, nfsrvd_notsupp, nfsrvd_sequence, nfsrvd_notsupp, @@ -908,6 +908,11 @@ nfsrvd_compound(struct nfsrv_descript *n savevpnes = vpnes; save_fsid = cur_fsid; } + if ((nd->nd_flag & ND_CURSTATEID) != 0) { + nd->nd_savedcurstateid = + nd->nd_curstateid; + nd->nd_flag |= ND_SAVEDCURSTATEID; + } } else { nd->nd_repstat = NFSERR_NOFILEHANDLE; } @@ -923,6 +928,11 @@ nfsrvd_compound(struct nfsrv_descript *n vpnes = savevpnes; cur_fsid = save_fsid; } + if ((nd->nd_flag & ND_SAVEDCURSTATEID) != 0) { + nd->nd_curstateid = + nd->nd_savedcurstateid; + nd->nd_flag |= ND_CURSTATEID; + } } else { nd->nd_repstat = NFSERR_RESTOREFH; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704282147.v3SLlJQ6079251>