diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-05-20 10:33:17 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-05-20 10:33:17 +1000 |
| commit | 2a4ad5894c819978dca5595396d54d51c3aca694 (patch) | |
| tree | 62fcfac878219b36da9156785d832184194fd98a /fs/xfs/xfs_log_recover.c | |
| parent | a7792aad644a259375002db8c9d9e03fd50bf509 (diff) | |
| parent | 6e3e6d55e51774ec7cfc24975749bbddb28a9051 (diff) | |
| download | op-kernel-dev-2a4ad5894c819978dca5595396d54d51c3aca694.zip op-kernel-dev-2a4ad5894c819978dca5595396d54d51c3aca694.tar.gz | |
Merge branch 'xfs-4.7-misc-fixes' into for-next
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 558f3d1..8359978 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -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; |
