Merge pull request #110 from devimc/hack9p

kernel: fix 9p fs unlink-ftruncate
clearcontainers · Oct 9, 2017 · 0f0259e · 0f0259e
2 parents d6fe783 + d60fef5
commit 0f0259e
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/kernel/debian.series b/kernel/debian.series
@@ -17,4 +17,5 @@
 0205-reboot.patch
 0206-no-early-modprobe.patch
 0208-Show-restart-information-using-info-log.patch
+0209-HACK-9P-always-use-cached-inode-to-fill-in-v9fs_vfs_.patch
 0002-UBUNTU-SAUCE-no-up-disable-pie-when-gcc-has-it-enabl.patch
diff --git a/kernel/linux-container.spec-template b/kernel/linux-container.spec-template
@@ -56,6 +56,7 @@ Patch0204: 0204-rdrand.patch
 Patch0205: 0205-reboot.patch
 Patch0206: 0206-no-early-modprobe.patch
 Patch0208: 0208-Show-restart-information-using-info-log.patch
+Patch0209: 0209-HACK-9P-always-use-cached-inode-to-fill-in-v9fs_vfs_.patch
 
 # Serie    XYYY: Extra features modules
 
@@ -88,6 +89,7 @@ The Linux kernel.
 %patch0205 -p1
 %patch0206 -p1
 %patch0208 -p1
+%patch0209 -p1
 
 # Serie    XYYY: Extra features modules
 

diff --git a/kernel/patches-4.9.x/0209-HACK-9P-always-use-cached-inode-to-fill-in-v9fs_vfs_.patch b/kernel/patches-4.9.x/0209-HACK-9P-always-use-cached-inode-to-fill-in-v9fs_vfs_.patch
@@ -0,0 +1,43 @@
+From cb9d8ef839855dedb4cb9c167510b171a00b098d Mon Sep 17 00:00:00 2001
+From: Julio Montes <[email protected]>
+Date: Mon, 18 Sep 2017 11:46:59 -0500
+Subject: [PATCH] HACK: 9P: always use cached inode to fill in v9fs_vfs_getattr
+
+So that if in cache=none mode, we don't have to lookup server that
+might not support open-unlink-fstat operation.
+
+Signed-off-by: Peng Tao <[email protected]>
+---
+ fs/9p/vfs_inode.c      | 2 +-
+ fs/9p/vfs_inode_dotl.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
+index c00487e..0fc1cd4 100644
+--- a/fs/9p/vfs_inode.c
++++ b/fs/9p/vfs_inode.c
+@@ -1067,7 +1067,7 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
+
+ 	p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry);
+ 	v9ses = v9fs_dentry2v9ses(dentry);
+-	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
++	if (!d_really_is_negative(dentry) || v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
+ 		generic_fillattr(d_inode(dentry), stat);
+ 		return 0;
+ 	}
+diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
+index afaa4b6..0c6fb9c 100644
+--- a/fs/9p/vfs_inode_dotl.c
++++ b/fs/9p/vfs_inode_dotl.c
+@@ -477,7 +477,7 @@ v9fs_vfs_getattr_dotl(struct vfsmount *mnt, struct dentry *dentry,
+
+ 	p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry);
+ 	v9ses = v9fs_dentry2v9ses(dentry);
+-	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
++	if (!d_really_is_negative(dentry) || v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
+ 		generic_fillattr(d_inode(dentry), stat);
+ 		return 0;
+ 	}
+-- 
+2.7.5
+