mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-09-17 14:58:16 +00:00
c035cdb3ef
Linux 5.10.x is the new LTS branch, move kata to a more recent kernel branch. Fixes: #1288 Signed-off-by: Carlos Venegas <jos.c.venegas.munoz@intel.com>
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From cab495651e8f71c39e87a08abbe051916110b3ca Mon Sep 17 00:00:00 2001
|
|
From: Julio Montes <julio.montes@intel.com>
|
|
Date: Mon, 18 Sep 2017 11:46:59 -0500
|
|
Subject: [PATCH 3/5] NO-UPSTREAM: 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.
|
|
|
|
fixes https://github.com/01org/cc-oci-runtime/issues/47
|
|
fixes https://github.com/01org/cc-oci-runtime/issues/1062
|
|
|
|
Signed-off-by: Peng Tao <bergwolf@gmail.com>
|
|
---
|
|
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 85ff859d3af5..efdc2a8f37bb 100644
|
|
--- a/fs/9p/vfs_inode.c
|
|
+++ b/fs/9p/vfs_inode.c
|
|
@@ -1080,7 +1080,7 @@ v9fs_vfs_getattr(const struct path *path, struct kstat *stat,
|
|
|
|
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 4823e1c46999..daa5e6a41864 100644
|
|
--- a/fs/9p/vfs_inode_dotl.c
|
|
+++ b/fs/9p/vfs_inode_dotl.c
|
|
@@ -480,7 +480,7 @@ v9fs_vfs_getattr_dotl(const struct path *path, struct kstat *stat,
|
|
|
|
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.20.1
|
|
|