android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ufs: ufs_trunc_direct() always returns 0

Browse Source 
make it return void

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2015-06-16 18:43:08 -04:00
parent dff7cfd36e
commit 6a799d3514
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/ufs/truncate.c
View File

@ -63,7 +63,7 @@
#define DIRECT_FRAGMENT ((inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift) #define DIRECT_FRAGMENT ((inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift)
static int ufs_trunc_direct(struct inode *inode) static void ufs_trunc_direct(struct inode *inode)
{ {
struct ufs_inode_info *ufsi = UFS_I(inode); struct ufs_inode_info *ufsi = UFS_I(inode);
struct super_block * sb; struct super_block * sb;
@ -72,7 +72,6 @@ static int ufs_trunc_direct(struct inode *inode)
u64 frag1, frag2, frag3, frag4, block1, block2; u64 frag1, frag2, frag3, frag4, block1, block2;
unsigned frag_to_free, free_count; unsigned frag_to_free, free_count;
unsigned i, tmp; unsigned i, tmp;
int retry;
UFSD("ENTER: ino %lu\n", inode->i_ino); UFSD("ENTER: ino %lu\n", inode->i_ino);
@ -81,7 +80,6 @@ static int ufs_trunc_direct(struct inode *inode)
frag_to_free = 0; frag_to_free = 0;
free_count = 0; free_count = 0;
retry = 0;
frag1 = DIRECT_FRAGMENT; frag1 = DIRECT_FRAGMENT;
frag4 = min_t(u64, UFS_NDIR_FRAGMENT, ufsi->i_lastfrag); frag4 = min_t(u64, UFS_NDIR_FRAGMENT, ufsi->i_lastfrag);
@ -168,7 +166,6 @@ next1:
next3: next3:
UFSD("EXIT: ino %lu\n", inode->i_ino); UFSD("EXIT: ino %lu\n", inode->i_ino);
return retry;
} }
@ -467,8 +464,8 @@ static void __ufs_truncate_blocks(struct inode *inode)
mutex_lock(&ufsi->truncate_mutex); mutex_lock(&ufsi->truncate_mutex);
while (1) { while (1) {
retry = ufs_trunc_direct(inode); ufs_trunc_direct(inode);
retry |= ufs_trunc_indirect(inode, UFS_IND_BLOCK, retry = ufs_trunc_indirect(inode, UFS_IND_BLOCK,
ufs_get_direct_data_ptr(uspi, ufsi, ufs_get_direct_data_ptr(uspi, ufsi,
UFS_IND_BLOCK)); UFS_IND_BLOCK));
retry |= ufs_trunc_dindirect(inode, UFS_IND_BLOCK + uspi->s_apb, retry |= ufs_trunc_dindirect(inode, UFS_IND_BLOCK + uspi->s_apb,