iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udf: Convert udf_add_nondir() to new directory iteration

Browse Source 
Convert udf_add_nondir() to new directory iteration code.

Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara
2022-10-06 14:08:59 +02:00
parent f284480340
commit ef91f9998b
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/udf/namei.c
View File

@ -847,26 +847,23 @@ static int udf_add_nondir(struct dentry *dentry, struct inode *inode)
{ {
struct udf_inode_info *iinfo = UDF_I(inode); struct udf_inode_info *iinfo = UDF_I(inode);
struct inode *dir = d_inode(dentry->d_parent); struct inode *dir = d_inode(dentry->d_parent);
struct udf_fileident_bh fibh; struct udf_fileident_iter iter;
struct fileIdentDesc cfi, *fi;
int err; int err;
fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err); err = udf_fiiter_add_entry(dir, dentry, &iter);
if (unlikely(!fi)) { if (err) {
inode_dec_link_count(inode); inode_dec_link_count(inode);
discard_new_inode(inode); discard_new_inode(inode);
return err; return err;
} }
cfi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize); iter.fi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize);
cfi.icb.extLocation = cpu_to_lelb(iinfo->i_location); iter.fi.icb.extLocation = cpu_to_lelb(iinfo->i_location);
*(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse = *(__le32 *)((struct allocDescImpUse *)iter.fi.icb.impUse)->impUse =
cpu_to_le32(iinfo->i_unique & 0x00000000FFFFFFFFUL); cpu_to_le32(iinfo->i_unique & 0x00000000FFFFFFFFUL);
udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL); udf_fiiter_write_fi(&iter, NULL);
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);
if (fibh.sbh != fibh.ebh) udf_fiiter_release(&iter);
brelse(fibh.ebh);
brelse(fibh.sbh);
d_instantiate_new(dentry, inode); d_instantiate_new(dentry, inode);
return 0; return 0;