| Message ID | 20240315160728.647c299b@eclair (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] fs/9p: only translate RWX permissions for plain 9P2000 | expand |
diff --git a/fs/9p/fid.h b/fs/9p/fid.h index 29281b7c3887..0d6138bee2a3 100644 --- a/fs/9p/fid.h +++ b/fs/9p/fid.h @@ -49,9 +49,6 @@ static inline struct p9_fid *v9fs_fid_clone(struct dentry *dentry) static inline void v9fs_fid_add_modes(struct p9_fid *fid, unsigned int s_flags, unsigned int s_cache, unsigned int f_flags) { - if (fid->qid.type != P9_QTFILE) - return; - if ((!s_cache) || ((fid->qid.version == 0) && !(s_flags & V9FS_IGNORE_QV)) || (s_flags & V9FS_DIRECT_IO) || (f_flags & O_DIRECT)) {
I'm not sure why this check was ever here. After updating to 6.6 I suddenly found caching had been turned on by default and neither cache=none nor the new directio would turn it off. After walking through the new code very manually I realized that it's because the caching has to be, in effect, turned off explicitly by setting P9L_DIRECT and whenever a file has a flag, in my case QTAPPEND, it doesn't get set. #define QTDIR 0x80 #define QTAPPEND 0x40 #define QTEXCL 0x20 #define QTAUTH 0x08 #define QTTMP 0x04 #define QTFILE 0x00 Setting aside QTDIR which seems to ignore the new fid->mode entirely, the rest of these either should be subject to the same cache rules as every other QTFILE or perhaps very explicitly not cached in the case of QTAUTH. From 7ee510d31c0b6074dbd8bc27c1fb86f12270f851 Mon Sep 17 00:00:00 2001 From: Joakim Sindholt <opensource@zhasha.com> Date: Fri, 15 Mar 2024 15:19:10 +0100 Subject: [PATCH 4/4] fs/9p: fix the cache always being enabled on files with qid flags --- fs/9p/fid.h | 3 --- 1 file changed, 3 deletions(-)