@@ -180,7 +180,7 @@ static struct btrfs_ordered_extent *alloc_ordered_extent(
180
180
entry -> disk_num_bytes = disk_num_bytes ;
181
181
entry -> offset = offset ;
182
182
entry -> bytes_left = num_bytes ;
183
- entry -> inode = igrab (& inode -> vfs_inode );
183
+ entry -> inode = BTRFS_I ( igrab (& inode -> vfs_inode ) );
184
184
entry -> compress_type = compress_type ;
185
185
entry -> truncated_len = (u64 )- 1 ;
186
186
entry -> qgroup_rsv = qgroup_rsv ;
@@ -208,7 +208,7 @@ static struct btrfs_ordered_extent *alloc_ordered_extent(
208
208
209
209
static void insert_ordered_extent (struct btrfs_ordered_extent * entry )
210
210
{
211
- struct btrfs_inode * inode = BTRFS_I ( entry -> inode ) ;
211
+ struct btrfs_inode * inode = entry -> inode ;
212
212
struct btrfs_root * root = inode -> root ;
213
213
struct btrfs_fs_info * fs_info = root -> fs_info ;
214
214
struct rb_node * node ;
@@ -310,7 +310,7 @@ struct btrfs_ordered_extent *btrfs_alloc_ordered_extent(
310
310
void btrfs_add_ordered_sum (struct btrfs_ordered_extent * entry ,
311
311
struct btrfs_ordered_sum * sum )
312
312
{
313
- struct btrfs_inode * inode = BTRFS_I ( entry -> inode ) ;
313
+ struct btrfs_inode * inode = entry -> inode ;
314
314
315
315
spin_lock_irq (& inode -> ordered_tree_lock );
316
316
list_add_tail (& sum -> list , & entry -> list );
@@ -320,7 +320,7 @@ void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,
320
320
void btrfs_mark_ordered_extent_error (struct btrfs_ordered_extent * ordered )
321
321
{
322
322
if (!test_and_set_bit (BTRFS_ORDERED_IOERR , & ordered -> flags ))
323
- mapping_set_error (ordered -> inode -> i_mapping , - EIO );
323
+ mapping_set_error (ordered -> inode -> vfs_inode . i_mapping , - EIO );
324
324
}
325
325
326
326
static void finish_ordered_fn (struct btrfs_work * work )
@@ -335,7 +335,7 @@ static bool can_finish_ordered_extent(struct btrfs_ordered_extent *ordered,
335
335
struct page * page , u64 file_offset ,
336
336
u64 len , bool uptodate )
337
337
{
338
- struct btrfs_inode * inode = BTRFS_I ( ordered -> inode ) ;
338
+ struct btrfs_inode * inode = ordered -> inode ;
339
339
struct btrfs_fs_info * fs_info = inode -> root -> fs_info ;
340
340
341
341
lockdep_assert_held (& inode -> ordered_tree_lock );
@@ -388,7 +388,7 @@ static bool can_finish_ordered_extent(struct btrfs_ordered_extent *ordered,
388
388
389
389
static void btrfs_queue_ordered_fn (struct btrfs_ordered_extent * ordered )
390
390
{
391
- struct btrfs_inode * inode = BTRFS_I ( ordered -> inode ) ;
391
+ struct btrfs_inode * inode = ordered -> inode ;
392
392
struct btrfs_fs_info * fs_info = inode -> root -> fs_info ;
393
393
struct btrfs_workqueue * wq = btrfs_is_free_space_inode (inode ) ?
394
394
fs_info -> endio_freespace_worker : fs_info -> endio_write_workers ;
@@ -401,7 +401,7 @@ void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,
401
401
struct page * page , u64 file_offset , u64 len ,
402
402
bool uptodate )
403
403
{
404
- struct btrfs_inode * inode = BTRFS_I ( ordered -> inode ) ;
404
+ struct btrfs_inode * inode = ordered -> inode ;
405
405
unsigned long flags ;
406
406
bool ret ;
407
407
@@ -610,14 +610,14 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry)
610
610
struct list_head * cur ;
611
611
struct btrfs_ordered_sum * sum ;
612
612
613
- trace_btrfs_ordered_extent_put (BTRFS_I ( entry -> inode ) , entry );
613
+ trace_btrfs_ordered_extent_put (entry -> inode , entry );
614
614
615
615
if (refcount_dec_and_test (& entry -> refs )) {
616
616
ASSERT (list_empty (& entry -> root_extent_list ));
617
617
ASSERT (list_empty (& entry -> log_list ));
618
618
ASSERT (RB_EMPTY_NODE (& entry -> rb_node ));
619
619
if (entry -> inode )
620
- btrfs_add_delayed_iput (BTRFS_I ( entry -> inode ) );
620
+ btrfs_add_delayed_iput (entry -> inode );
621
621
while (!list_empty (& entry -> list )) {
622
622
cur = entry -> list .next ;
623
623
sum = list_entry (cur , struct btrfs_ordered_sum , list );
@@ -849,7 +849,7 @@ void btrfs_start_ordered_extent(struct btrfs_ordered_extent *entry)
849
849
{
850
850
u64 start = entry -> file_offset ;
851
851
u64 end = start + entry -> num_bytes - 1 ;
852
- struct btrfs_inode * inode = BTRFS_I ( entry -> inode ) ;
852
+ struct btrfs_inode * inode = entry -> inode ;
853
853
bool freespace_inode ;
854
854
855
855
trace_btrfs_ordered_extent_start (inode , entry );
@@ -1208,7 +1208,7 @@ bool btrfs_try_lock_ordered_range(struct btrfs_inode *inode, u64 start, u64 end,
1208
1208
struct btrfs_ordered_extent * btrfs_split_ordered_extent (
1209
1209
struct btrfs_ordered_extent * ordered , u64 len )
1210
1210
{
1211
- struct btrfs_inode * inode = BTRFS_I ( ordered -> inode ) ;
1211
+ struct btrfs_inode * inode = ordered -> inode ;
1212
1212
struct btrfs_root * root = inode -> root ;
1213
1213
struct btrfs_fs_info * fs_info = root -> fs_info ;
1214
1214
u64 file_offset = ordered -> file_offset ;
0 commit comments