diff options
| author | Jan Kara <jack@suse.cz> | 2022-10-06 14:08:59 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2023-01-09 10:39:52 +0100 |
| commit | ef91f9998bece00cf7f82ad26177f910a7124b25 (patch) | |
| tree | 1e7fc3fedf9ed5ea658fe24c66cb1eff1b52d660 | |
| parent | udf: Implement adding of dir entries using new iteration code (diff) | |
| download | linux-ef91f9998bece00cf7f82ad26177f910a7124b25.tar.xz linux-ef91f9998bece00cf7f82ad26177f910a7124b25.zip | |
udf: Convert udf_add_nondir() to new directory iteration
Convert udf_add_nondir() to new directory iteration code.
Signed-off-by: Jan Kara <jack@suse.cz>
| -rw-r--r-- | fs/udf/namei.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index 2e423c10dc99..788ac6c1642e 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -847,26 +847,23 @@ static int udf_add_nondir(struct dentry *dentry, struct inode *inode) { struct udf_inode_info *iinfo = UDF_I(inode); struct inode *dir = d_inode(dentry->d_parent); - struct udf_fileident_bh fibh; - struct fileIdentDesc cfi, *fi; + struct udf_fileident_iter iter; int err; - fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err); - if (unlikely(!fi)) { + err = udf_fiiter_add_entry(dir, dentry, &iter); + if (err) { inode_dec_link_count(inode); discard_new_inode(inode); return err; } - cfi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize); - cfi.icb.extLocation = cpu_to_lelb(iinfo->i_location); - *(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse = + iter.fi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize); + iter.fi.icb.extLocation = cpu_to_lelb(iinfo->i_location); + *(__le32 *)((struct allocDescImpUse *)iter.fi.icb.impUse)->impUse = 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); mark_inode_dirty(dir); - if (fibh.sbh != fibh.ebh) - brelse(fibh.ebh); - brelse(fibh.sbh); + udf_fiiter_release(&iter); d_instantiate_new(dentry, inode); return 0; |