shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

udf: Convert udf_unlink() to new directory iteration code

Browse Source 
[ Upstream commit 6ec01a8020 ]

Convert udf_unlink() to new directory iteration code.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jan Kara
2024-10-17 14:19:08 -03:00
committed by Greg Kroah-Hartman
parent d2e664c667
commit 4e52300d9c
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
fs/udf/namei.c
View File

@@ -933,24 +933,17 @@ out:
static int udf_unlink(struct inode *dir, struct dentry *dentry) static int udf_unlink(struct inode *dir, struct dentry *dentry)
{ {
int retval; int ret;
struct inode *inode = d_inode(dentry); struct inode *inode = d_inode(dentry);
struct udf_fileident_bh fibh; struct udf_fileident_iter iter;
struct fileIdentDesc *fi;
struct fileIdentDesc cfi;
struct kernel_lb_addr tloc; struct kernel_lb_addr tloc;
retval = -ENOENT; ret = udf_fiiter_find_entry(dir, &dentry->d_name, &iter);
fi = udf_find_entry(dir, &dentry->d_name, &fibh, &cfi); if (ret)
if (IS_ERR_OR_NULL(fi)) {
if (fi)
retval = PTR_ERR(fi);
goto out; goto out;
}
retval = -EIO; ret = -EFSCORRUPTED;
tloc = lelb_to_cpu(cfi.icb.extLocation); tloc = lelb_to_cpu(iter.fi.icb.extLocation);
if (udf_get_lb_pblock(dir->i_sb, &tloc, 0) != inode->i_ino) if (udf_get_lb_pblock(dir->i_sb, &tloc, 0) != inode->i_ino)
goto end_unlink; goto end_unlink;
@@ -959,22 +952,16 @@ static int udf_unlink(struct inode *dir, struct dentry *dentry)
inode->i_ino, inode->i_nlink); inode->i_ino, inode->i_nlink);
set_nlink(inode, 1); set_nlink(inode, 1);
} }
retval = udf_delete_entry(dir, fi, &fibh, &cfi); udf_fiiter_delete_entry(&iter);
if (retval)
goto end_unlink;
dir->i_ctime = dir->i_mtime = current_time(dir); dir->i_ctime = dir->i_mtime = current_time(dir);
mark_inode_dirty(dir); mark_inode_dirty(dir);
inode_dec_link_count(inode); inode_dec_link_count(inode);
inode->i_ctime = dir->i_ctime; inode->i_ctime = dir->i_ctime;
retval = 0; ret = 0;
end_unlink: end_unlink:
if (fibh.sbh != fibh.ebh) udf_fiiter_release(&iter);
brelse(fibh.ebh);
brelse(fibh.sbh);
out: out:
return retval; return ret;
} }
static int udf_symlink(struct user_namespace *mnt_userns, struct inode *dir, static int udf_symlink(struct user_namespace *mnt_userns, struct inode *dir,