d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unused variable + style(9) fixes inside the ext4_ext_find_extent()

Browse Source 
Approved by:    pfg (mentor)
Reported by:    Coverity
CID:            1381754
MFC after:      6 months
This commit is contained in:
fsu 2017-10-19 16:42:03 +00:00
parent 1c46f2023f
commit 4140eed8a1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/fs/ext2fs/ext2_extents.c
View File

@ -377,11 +377,11 @@ ext4_ext_find_extent(struct inode *ip, daddr_t block,
if (error) if (error)
return (error); return (error);
if (!ppath) if (ppath == NULL)
return (EINVAL); return (EINVAL);
path = *ppath; path = *ppath;
if (!path) { if (path == NULL) {
path = malloc(EXT4_EXT_DEPTH_MAX * path = malloc(EXT4_EXT_DEPTH_MAX *
sizeof(struct ext4_extent_path), sizeof(struct ext4_extent_path),
M_EXT2EXTENTS, M_WAITOK | M_ZERO); M_EXT2EXTENTS, M_WAITOK | M_ZERO);
@ -1349,7 +1349,7 @@ ext4_ext_rm_leaf(struct inode *ip, struct ext4_extent_path *path,
uint64_t start) uint64_t start)
{ {
struct m_ext2fs *fs; struct m_ext2fs *fs;
int depth, credits; int depth;
struct ext4_extent_header *eh; struct ext4_extent_header *eh;
unsigned int a, b, block, num; unsigned int a, b, block, num;
unsigned long ex_blk; unsigned long ex_blk;
@ -1402,11 +1402,8 @@ ext4_ext_rm_leaf(struct inode *ip, struct ext4_extent_path *path,
("ext4_ext_rm_leaf: bad b")); ("ext4_ext_rm_leaf: bad b"));
} }
credits = EXT4_EXT_DEPTH_MAX; if (ex == EXT_FIRST_EXTENT(eh))
if (ex == EXT_FIRST_EXTENT(eh)) {
correct_index = 1; correct_index = 1;
credits += (ext4_ext_inode_depth(ip)) + 1;
}
error = ext4_remove_blocks(ip, ex, a, b); error = ext4_remove_blocks(ip, ex, a, b);
if (error) if (error)