xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: Prevent truncation of an unlinked inode from blocking access to its directory

Browse Source 
[ Upstream commit e5d74a2d0ee67ae00edad43c3d7811016e4d2e21 ]

Truncation of an unlinked inode may take a long time for I/O waiting, and
it doesn't have to prevent access to the directory. Thus, let truncation
occur outside the directory's mutex, just like do_unlinkat() does.

Signed-off-by: Yu Hsiang Huang <nickhuang@synology.com>
Signed-off-by: Bing Jing Chang <bingjingc@synology.com>
Signed-off-by: Robbie Ko <robbieko@synology.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yu Hsiang Huang
2021-05-14 11:58:29 +08:00
committed by Greg Kroah-Hartman
parent e7bbdd7dee
commit f666a75ccd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfsd/vfs.c
View File

@@ -1870,6 +1870,7 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
{ {
struct dentry *dentry, *rdentry; struct dentry *dentry, *rdentry;
struct inode *dirp; struct inode *dirp;
struct inode *rinode;
__be32 err; __be32 err;
int host_err; int host_err;
@@ -1898,6 +1899,8 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
host_err = -ENOENT; host_err = -ENOENT;
goto out_drop_write; goto out_drop_write;
} }
rinode = d_inode(rdentry);
ihold(rinode);
if (!type) if (!type)
type = d_inode(rdentry)->i_mode & S_IFMT; type = d_inode(rdentry)->i_mode & S_IFMT;
@@ -1913,6 +1916,8 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
if (!host_err) if (!host_err)
host_err = commit_metadata(fhp); host_err = commit_metadata(fhp);
dput(rdentry); dput(rdentry);
fh_unlock(fhp);
iput(rinode); /* truncate the inode here */
out_drop_write: out_drop_write:
fh_drop_write(fhp); fh_drop_write(fhp);