UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

udf: Propagate errors from udf_truncate_extents() 

Make udf_truncate_extents() properly propagate errors to its callers and
let udf_setsize() handle the error properly as well. This lets userspace
know in case there's some error when truncating blocks.

Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2019-03-11 15:27:02 +01:00
parent d3ca4651d0
commit 2b42be5eb2
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/udf/inode.c
View File

@ -1242,8 +1242,10 @@ set_size:
truncate_setsize(inode, newsize); truncate_setsize(inode, newsize);
down_write(&iinfo->i_data_sem); down_write(&iinfo->i_data_sem);
udf_clear_extent_cache(inode); udf_clear_extent_cache(inode);
udf_truncate_extents(inode); err = udf_truncate_extents(inode);
up_write(&iinfo->i_data_sem); up_write(&iinfo->i_data_sem);
if (err)
return err;
} }
update_time: update_time:
inode->i_mtime = inode->i_ctime = current_time(inode); inode->i_mtime = inode->i_ctime = current_time(inode);

7
fs/udf/truncate.c
View File

@ -199,7 +199,7 @@ static void udf_update_alloc_ext_desc(struct inode *inode,
* for making file shorter. For making file longer, udf_extend_file() has to * for making file shorter. For making file longer, udf_extend_file() has to
* be used. * be used.
*/ */
void udf_truncate_extents(struct inode *inode) int udf_truncate_extents(struct inode *inode)
{ {
struct extent_position epos; struct extent_position epos;
struct kernel_lb_addr eloc, neloc = {}; struct kernel_lb_addr eloc, neloc = {};
@ -224,7 +224,7 @@ void udf_truncate_extents(struct inode *inode)
if (etype == -1) { if (etype == -1) {
/* We should extend the file? */ /* We should extend the file? */
WARN_ON(byte_offset); WARN_ON(byte_offset);
return; return 0;
} }
epos.offset -= adsize; epos.offset -= adsize;
extent_trunc(inode, &epos, &eloc, etype, elen, byte_offset); extent_trunc(inode, &epos, &eloc, etype, elen, byte_offset);
@ -262,7 +262,7 @@ void udf_truncate_extents(struct inode *inode)
udf_get_lb_pblock(sb, &eloc, 0)); udf_get_lb_pblock(sb, &eloc, 0));
/* Error reading indirect block? */ /* Error reading indirect block? */
if (!epos.bh) if (!epos.bh)
return; return -EIO;
if (elen) if (elen)
indirect_ext_len = indirect_ext_len =
(elen + sb->s_blocksize - 1) >> (elen + sb->s_blocksize - 1) >>
@ -286,4 +286,5 @@ void udf_truncate_extents(struct inode *inode)
iinfo->i_lenExtents = inode->i_size; iinfo->i_lenExtents = inode->i_size;
brelse(epos.bh); brelse(epos.bh);
return 0;
} }

2
fs/udf/udfdecl.h
View File

@ -235,7 +235,7 @@ extern struct inode *udf_new_inode(struct inode *, umode_t);
/* truncate.c */ /* truncate.c */
extern void udf_truncate_tail_extent(struct inode *); extern void udf_truncate_tail_extent(struct inode *);
extern void udf_discard_prealloc(struct inode *); extern void udf_discard_prealloc(struct inode *);
extern void udf_truncate_extents(struct inode *); extern int udf_truncate_extents(struct inode *);
/* balloc.c */ /* balloc.c */
extern void udf_free_blocks(struct super_block *, struct inode *, extern void udf_free_blocks(struct super_block *, struct inode *,