xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xfs-4.7-misc-fixes' into for-next

Browse Source
This commit is contained in:
Dave Chinner
2016-05-20 10:33:17 +10:00
parent a7792aad64 6e3e6d55e5
commit 2a4ad5894c
10 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_log_recover.c
View File

@@ -3843,7 +3843,7 @@ xlog_recover_add_to_cont_trans(
old_ptr = item->ri_buf[item->ri_cnt-1].i_addr;
old_len = item->ri_buf[item->ri_cnt-1].i_len;
ptr = kmem_realloc(old_ptr, len+old_len, old_len, KM_SLEEP);
ptr = kmem_realloc(old_ptr, len + old_len, KM_SLEEP);
memcpy(&ptr[old_len], dp, len);
item->ri_buf[item->ri_cnt-1].i_len += len;
item->ri_buf[item->ri_cnt-1].i_addr = ptr;