From: Jan Kara <jack@xxxxxxx>
[ Upstream commit f386c802a6fda8f9fe4a5cf418c49aa84dfc52e4 ]
Nobody uses the bh returned from udf_expand_dir_adinicb(). Don't return
it.
Signed-off-by: Jan Kara <jack@xxxxxxx>
[cascardo: skip backport of 101ee137d32a ("udf: Drop VARCONV support")]
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/udf/namei.c | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -136,8 +136,7 @@ static struct dentry *udf_lookup(struct
return d_splice_alias(inode, dentry);
}
-static struct buffer_head *udf_expand_dir_adinicb(struct inode *inode,
- udf_pblk_t *block, int *err)
+static int udf_expand_dir_adinicb(struct inode *inode, udf_pblk_t *block)
{
udf_pblk_t newblock;
struct buffer_head *dbh = NULL;
@@ -157,23 +156,23 @@ static struct buffer_head *udf_expand_di
if (!inode->i_size) {
iinfo->i_alloc_type = alloctype;
mark_inode_dirty(inode);
- return NULL;
+ return 0;
}
/* alloc block, and copy data to it */
*block = udf_new_block(inode->i_sb, inode,
iinfo->i_location.partitionReferenceNum,
- iinfo->i_location.logicalBlockNum, err);
+ iinfo->i_location.logicalBlockNum, &ret);
if (!(*block))
- return NULL;
+ return ret;
newblock = udf_get_pblock(inode->i_sb, *block,
iinfo->i_location.partitionReferenceNum,
0);
- if (!newblock)
- return NULL;
+ if (newblock == 0xffffffff)
+ return -EFSCORRUPTED;
dbh = udf_tgetblk(inode->i_sb, newblock);
if (!dbh)
- return NULL;
+ return -ENOMEM;
lock_buffer(dbh);
memcpy(dbh->b_data, iinfo->i_data, inode->i_size);
memset(dbh->b_data + inode->i_size, 0,
@@ -195,9 +194,9 @@ static struct buffer_head *udf_expand_di
ret = udf_add_aext(inode, &epos, &eloc, inode->i_size, 0);
brelse(epos.bh);
if (ret < 0) {
- *err = ret;
+ brelse(dbh);
udf_free_blocks(inode->i_sb, inode, &eloc, 0, 1);
- return NULL;
+ return ret;
}
mark_inode_dirty(inode);
@@ -213,6 +212,7 @@ static struct buffer_head *udf_expand_di
impuse = NULL;
udf_fiiter_write_fi(&iter, impuse);
}
+ brelse(dbh);
/*
* We don't expect the iteration to fail as the directory has been
* already verified to be correct
@@ -220,7 +220,7 @@ static struct buffer_head *udf_expand_di
WARN_ON_ONCE(ret);
udf_fiiter_release(&iter);
- return dbh;
+ return 0;
}
static int udf_fiiter_add_entry(struct inode *dir, struct dentry *dentry,
@@ -266,17 +266,10 @@ static int udf_fiiter_add_entry(struct i
}
if (dinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB &&
blksize - udf_ext0_offset(dir) - iter->pos < nfidlen) {
- struct buffer_head *retbh;
-
udf_fiiter_release(iter);
- /*
- * FIXME: udf_expand_dir_adinicb does not need to return bh
- * once other users are gone
- */
- retbh = udf_expand_dir_adinicb(dir, &block, &ret);
- if (!retbh)
+ ret = udf_expand_dir_adinicb(dir, &block);
+ if (ret)
return ret;
- brelse(retbh);
ret = udf_fiiter_init(iter, dir, dir->i_size);
if (ret < 0)
return ret;
Patches currently in stable-queue which might be from cascardo@xxxxxxxxxx are
queue-6.1/udf-handle-error-when-expanding-directory.patch
queue-6.1/udf-convert-empty_dir-to-new-directory-iteration-code.patch
queue-6.1/udf-convert-udf_expand_dir_adinicb-to-new-directory-iteration.patch
queue-6.1/udf-convert-udf_unlink-to-new-directory-iteration-code.patch
queue-6.1/udf-convert-udf_add_nondir-to-new-directory-iteration.patch
queue-6.1/udf-convert-udf_link-to-new-directory-iteration-code.patch
queue-6.1/udf-remove-old-directory-iteration-code.patch
queue-6.1/udf-don-t-return-bh-from-udf_expand_dir_adinicb.patch
queue-6.1/udf-new-directory-iteration-code.patch
queue-6.1/udf-convert-udf_rmdir-to-new-directory-iteration-code.patch
queue-6.1/udf-move-udf_expand_dir_adinicb-to-its-callsite.patch
queue-6.1/udf-convert-udf_readdir-to-new-directory-iteration.patch
queue-6.1/udf-convert-udf_mkdir-to-new-directory-iteration-code.patch
queue-6.1/udf-provide-function-to-mark-entry-as-deleted-using-new-directory-iteration-code.patch
queue-6.1/udf-convert-udf_lookup-to-use-new-directory-iteration-code.patch
queue-6.1/udf-implement-adding-of-dir-entries-using-new-iteration-code.patch
queue-6.1/udf-convert-udf_rename-to-new-directory-iteration-code.patch
queue-6.1/udf-convert-udf_get_parent-to-new-directory-iteration-code.patch
queue-6.1/udf-implement-searching-for-directory-entry-using-new-iteration-code.patch
