udf: Convert udf_add_nondir() to new directory iteration

[ Upstream commit ef91f9998bece00cf7f82ad26177f910a7124b25 ]

Convert udf_add_nondir() 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>

diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index e05360096dfbff1e151878c429eb86728d4a2399..6e5e37e405aeafa17d8741d268719b346135d32b 100644 (file)
--- 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;