Patchwork [V2] Add scratch directory for NFS upcall state storage

login
register
mail settings
Submitter Rich Dubielzig
Date Feb. 28, 2013, 6:43 p.m.
Message ID <1362077027-25696-1-git-send-email-rich.dubielzig@windriver.com>
Download mbox | patch
Permalink /patch/45313/
State New
Headers show

Comments

Rich Dubielzig - Feb. 28, 2013, 6:43 p.m.
When the /var/lib/nfs/v4recovery directory is not present, NFSD cannot
record the upcall state and cannot end the 90-second grace period on
startup.  This is true even when NFS4 is not being served according to
nfsstat.

More details and discussion here:
https://lkml.org/lkml/2012/6/11/206

Signed-off-by: Rich Dubielzig <rich.dubielzig@windriver.com>
---
 .../nfs-utils/nfs-utils_1.2.3.bb                   |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Richard Purdie - March 1, 2013, 2:47 p.m.
On Thu, 2013-02-28 at 10:43 -0800, Rich Dubielzig wrote:
> When the /var/lib/nfs/v4recovery directory is not present, NFSD cannot
> record the upcall state and cannot end the 90-second grace period on
> startup.  This is true even when NFS4 is not being served according to
> nfsstat.
> 
> More details and discussion here:
> https://lkml.org/lkml/2012/6/11/206
> 
> Signed-off-by: Rich Dubielzig <rich.dubielzig@windriver.com>
> ---
>  .../nfs-utils/nfs-utils_1.2.3.bb                   |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)

The subject line is missing the prefix ("nfs-utils: ") and this patch
doesn't apply against master which has nfs-utils 1.2.7?

Cheers,

Richard

> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
> index 84c4464..138791b 100644
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
> @@ -12,7 +12,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
>  RDEPENDS_${PN} = "rpcbind"
>  RRECOMMENDS_${PN} = "kernel-module-nfsd"
>  
> -PR = "r4"
> +PR = "r5"
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
>             file://nfs-utils-1.0.6-uclibc.patch \
> @@ -53,6 +53,8 @@ RDEPENDS_${PN}-stats = "python"
>  do_install_append () {
>  	install -d ${D}${sysconfdir}/init.d
>  	install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
> +	# kernel code as of 3.8 hard-codes this path as a default
> +	install -d ${D}/var/lib/nfs/v4recovery
>  
>  	# the following are built by CC_FOR_BUILD
>  	rm -f ${D}${sbindir}/rpcdebug

Patch

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
index 84c4464..138791b 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
@@ -12,7 +12,7 @@  DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
 RDEPENDS_${PN} = "rpcbind"
 RRECOMMENDS_${PN} = "kernel-module-nfsd"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
            file://nfs-utils-1.0.6-uclibc.patch \
@@ -53,6 +53,8 @@  RDEPENDS_${PN}-stats = "python"
 do_install_append () {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
+	# kernel code as of 3.8 hard-codes this path as a default
+	install -d ${D}/var/lib/nfs/v4recovery
 
 	# the following are built by CC_FOR_BUILD
 	rm -f ${D}${sbindir}/rpcdebug