Re: [PATCH v3] cifs: report error instead of invalid when revalidating a dentry fails
From: Steve French <smfrench@gmail.com>
Date: 2021-02-03 04:12:29
Also in:
linux-fsdevel
tentatively merged into cifs-2.6.git for-next pending a little more testing, and cc:stable as a separate patch - would like to know if worth trying the test case references in commit ecf3d1f1aa7 and adding the d_weak_revalidate routine that three filesystems added in that patch of Jeff. On Tue, Feb 2, 2021 at 11:43 AM Aurélien Aptel [off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: Aurelien Aptel <redacted> Assuming - //HOST/a is mounted on /mnt - //HOST/b is mounted on /mnt/b On a slow connection, running 'df' and killing it while it's processing /mnt/b can make cifs_get_inode_info() returns -ERESTARTSYS. This triggers the following chain of events: => the dentry revalidation fail => dentry is put and released => superblock associated with the dentry is put => /mnt/b is unmounted This patch makes cifs_d_revalidate() return the error instead of 0 (invalid) when cifs_revalidate_dentry() fails, except for ENOENT where that error means the dentry is invalid. Signed-off-by: Aurelien Aptel <redacted> Suggested-by: Shyam Prasad N <redacted> --- fs/cifs/dir.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 68900f1629bff..868c0b7263ec0 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c@@ -737,6 +737,7 @@ static int cifs_d_revalidate(struct dentry *direntry, unsigned int flags) { struct inode *inode; + int rc; if (flags & LOOKUP_RCU) return -ECHILD;@@ -746,8 +747,11 @@ cifs_d_revalidate(struct dentry *direntry, unsigned int flags) if ((flags & LOOKUP_REVAL) && !CIFS_CACHE_READ(CIFS_I(inode))) CIFS_I(inode)->time = 0; /* force reval */ - if (cifs_revalidate_dentry(direntry)) - return 0; + rc = cifs_revalidate_dentry(direntry); + if (rc) { + cifs_dbg(FYI, "cifs_revalidate_dentry failed with rc=%d", rc); + return rc == -ENOENT ? 0 : rc; + } else { /* * If the inode wasn't known to be a dfs entry when --2.29.2
-- Thanks, Steve