diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:35 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:25 -0400 |
commit | 883da600b00eb6fa9f8db5687759732b3c6dd357 (patch) | |
tree | ed044e2192aa10add56cb4b0c2ce7007f5bba8ce | |
parent | c4bc8dcbbe7a7876d76e3f3e129a2ccec46d7cdb (diff) |
reiserfs: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
-rw-r--r-- | fs/reiserfs/stree.c | 4 | ||||
-rw-r--r-- | fs/reiserfs/tail_conversion.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c index 313d39d639eb..77df82f9e70a 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c | |||
@@ -1284,12 +1284,12 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th, | |||
1284 | ** -clm | 1284 | ** -clm |
1285 | */ | 1285 | */ |
1286 | 1286 | ||
1287 | data = kmap_atomic(un_bh->b_page, KM_USER0); | 1287 | data = kmap_atomic(un_bh->b_page); |
1288 | off = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_CACHE_SIZE - 1)); | 1288 | off = ((le_ih_k_offset(&s_ih) - 1) & (PAGE_CACHE_SIZE - 1)); |
1289 | memcpy(data + off, | 1289 | memcpy(data + off, |
1290 | B_I_PITEM(PATH_PLAST_BUFFER(path), &s_ih), | 1290 | B_I_PITEM(PATH_PLAST_BUFFER(path), &s_ih), |
1291 | ret_value); | 1291 | ret_value); |
1292 | kunmap_atomic(data, KM_USER0); | 1292 | kunmap_atomic(data); |
1293 | } | 1293 | } |
1294 | /* Perform balancing after all resources have been collected at once. */ | 1294 | /* Perform balancing after all resources have been collected at once. */ |
1295 | do_balance(&s_del_balance, NULL, NULL, M_DELETE); | 1295 | do_balance(&s_del_balance, NULL, NULL, M_DELETE); |
diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c index d7f6e51bef2a..8f546bd473b8 100644 --- a/fs/reiserfs/tail_conversion.c +++ b/fs/reiserfs/tail_conversion.c | |||
@@ -128,9 +128,9 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, | |||
128 | if (up_to_date_bh) { | 128 | if (up_to_date_bh) { |
129 | unsigned pgoff = | 129 | unsigned pgoff = |
130 | (tail_offset + total_tail - 1) & (PAGE_CACHE_SIZE - 1); | 130 | (tail_offset + total_tail - 1) & (PAGE_CACHE_SIZE - 1); |
131 | char *kaddr = kmap_atomic(up_to_date_bh->b_page, KM_USER0); | 131 | char *kaddr = kmap_atomic(up_to_date_bh->b_page); |
132 | memset(kaddr + pgoff, 0, blk_size - total_tail); | 132 | memset(kaddr + pgoff, 0, blk_size - total_tail); |
133 | kunmap_atomic(kaddr, KM_USER0); | 133 | kunmap_atomic(kaddr); |
134 | } | 134 | } |
135 | 135 | ||
136 | REISERFS_I(inode)->i_first_direct_byte = U32_MAX; | 136 | REISERFS_I(inode)->i_first_direct_byte = U32_MAX; |