mirror of https://gitee.com/openkylin/linux.git
reiserfs: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
This commit is contained in:
parent
c4bc8dcbbe
commit
883da600b0
|
@ -1284,12 +1284,12 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th,
|
||||||
** -clm
|
** -clm
|
||||||
*/
|
*/
|
||||||
|
|
||||||
data = kmap_atomic(un_bh->b_page, KM_USER0);
|
data = kmap_atomic(un_bh->b_page);
|
||||||
off = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_CACHE_SIZE - 1));
|
off = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_CACHE_SIZE - 1));
|
||||||
memcpy(data + off,
|
memcpy(data + off,
|
||||||
B_I_PITEM(PATH_PLAST_BUFFER(path), &s_ih),
|
B_I_PITEM(PATH_PLAST_BUFFER(path), &s_ih),
|
||||||
ret_value);
|
ret_value);
|
||||||
kunmap_atomic(data, KM_USER0);
|
kunmap_atomic(data);
|
||||||
}
|
}
|
||||||
/* Perform balancing after all resources have been collected at once. */
|
/* Perform balancing after all resources have been collected at once. */
|
||||||
do_balance(&s_del_balance, NULL, NULL, M_DELETE);
|
do_balance(&s_del_balance, NULL, NULL, M_DELETE);
|
||||||
|
|
|
@ -128,9 +128,9 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode,
|
||||||
if (up_to_date_bh) {
|
if (up_to_date_bh) {
|
||||||
unsigned pgoff =
|
unsigned pgoff =
|
||||||
(tail_offset + total_tail - 1) & (PAGE_CACHE_SIZE - 1);
|
(tail_offset + total_tail - 1) & (PAGE_CACHE_SIZE - 1);
|
||||||
char *kaddr = kmap_atomic(up_to_date_bh->b_page, KM_USER0);
|
char *kaddr = kmap_atomic(up_to_date_bh->b_page);
|
||||||
memset(kaddr + pgoff, 0, blk_size - total_tail);
|
memset(kaddr + pgoff, 0, blk_size - total_tail);
|
||||||
kunmap_atomic(kaddr, KM_USER0);
|
kunmap_atomic(kaddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
REISERFS_I(inode)->i_first_direct_byte = U32_MAX;
|
REISERFS_I(inode)->i_first_direct_byte = U32_MAX;
|
||||||
|
|
Loading…
Reference in New Issue