Skip to content

Commit a937b97

Browse files
kdavemasoncl
kdave
authored and
masoncl
committed
btrfs: kill btrfs_inode_*time helpers
They just opencode taking address of the timespec member. Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <clm@fb.com>
1 parent 95449a1 commit a937b97

File tree

5 files changed

+33
-69
lines changed

5 files changed

+33
-69
lines changed

‎fs/btrfs/ctree.h

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2467,31 +2467,6 @@ BTRFS_SETGET_STACK_FUNCS(stack_inode_gid, struct btrfs_inode_item, gid, 32);
24672467
BTRFS_SETGET_STACK_FUNCS(stack_inode_mode, struct btrfs_inode_item, mode, 32);
24682468
BTRFS_SETGET_STACK_FUNCS(stack_inode_rdev, struct btrfs_inode_item, rdev, 64);
24692469
BTRFS_SETGET_STACK_FUNCS(stack_inode_flags, struct btrfs_inode_item, flags, 64);
2470-
2471-
static inline struct btrfs_timespec *
2472-
btrfs_inode_atime(struct btrfs_inode_item *inode_item)
2473-
{
2474-
unsigned long ptr = (unsigned long)inode_item;
2475-
ptr += offsetof(struct btrfs_inode_item, atime);
2476-
return (struct btrfs_timespec *)ptr;
2477-
}
2478-
2479-
static inline struct btrfs_timespec *
2480-
btrfs_inode_mtime(struct btrfs_inode_item *inode_item)
2481-
{
2482-
unsigned long ptr = (unsigned long)inode_item;
2483-
ptr += offsetof(struct btrfs_inode_item, mtime);
2484-
return (struct btrfs_timespec *)ptr;
2485-
}
2486-
2487-
static inline struct btrfs_timespec *
2488-
btrfs_inode_ctime(struct btrfs_inode_item *inode_item)
2489-
{
2490-
unsigned long ptr = (unsigned long)inode_item;
2491-
ptr += offsetof(struct btrfs_inode_item, ctime);
2492-
return (struct btrfs_timespec *)ptr;
2493-
}
2494-
24952470
BTRFS_SETGET_FUNCS(timespec_sec, struct btrfs_timespec, sec, 64);
24962471
BTRFS_SETGET_FUNCS(timespec_nsec, struct btrfs_timespec, nsec, 32);
24972472
BTRFS_SETGET_STACK_FUNCS(stack_timespec_sec, struct btrfs_timespec, sec, 64);

‎fs/btrfs/delayed-inode.c

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,27 +1755,26 @@ static void fill_stack_inode_item(struct btrfs_trans_handle *trans,
17551755
btrfs_set_stack_inode_flags(inode_item, BTRFS_I(inode)->flags);
17561756
btrfs_set_stack_inode_block_group(inode_item, 0);
17571757

1758-
btrfs_set_stack_timespec_sec(btrfs_inode_atime(inode_item),
1758+
btrfs_set_stack_timespec_sec(&inode_item->atime,
17591759
inode->i_atime.tv_sec);
1760-
btrfs_set_stack_timespec_nsec(btrfs_inode_atime(inode_item),
1760+
btrfs_set_stack_timespec_nsec(&inode_item->atime,
17611761
inode->i_atime.tv_nsec);
17621762

1763-
btrfs_set_stack_timespec_sec(btrfs_inode_mtime(inode_item),
1763+
btrfs_set_stack_timespec_sec(&inode_item->mtime,
17641764
inode->i_mtime.tv_sec);
1765-
btrfs_set_stack_timespec_nsec(btrfs_inode_mtime(inode_item),
1765+
btrfs_set_stack_timespec_nsec(&inode_item->mtime,
17661766
inode->i_mtime.tv_nsec);
17671767

1768-
btrfs_set_stack_timespec_sec(btrfs_inode_ctime(inode_item),
1768+
btrfs_set_stack_timespec_sec(&inode_item->ctime,
17691769
inode->i_ctime.tv_sec);
1770-
btrfs_set_stack_timespec_nsec(btrfs_inode_ctime(inode_item),
1770+
btrfs_set_stack_timespec_nsec(&inode_item->ctime,
17711771
inode->i_ctime.tv_nsec);
17721772
}
17731773

17741774
int btrfs_fill_inode(struct inode *inode, u32 *rdev)
17751775
{
17761776
struct btrfs_delayed_node *delayed_node;
17771777
struct btrfs_inode_item *inode_item;
1778-
struct btrfs_timespec *tspec;
17791778

17801779
delayed_node = btrfs_get_delayed_node(inode);
17811780
if (!delayed_node)
@@ -1802,17 +1801,14 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev)
18021801
*rdev = btrfs_stack_inode_rdev(inode_item);
18031802
BTRFS_I(inode)->flags = btrfs_stack_inode_flags(inode_item);
18041803

1805-
tspec = btrfs_inode_atime(inode_item);
1806-
inode->i_atime.tv_sec = btrfs_stack_timespec_sec(tspec);
1807-
inode->i_atime.tv_nsec = btrfs_stack_timespec_nsec(tspec);
1804+
inode->i_atime.tv_sec = btrfs_stack_timespec_sec(&inode_item->atime);
1805+
inode->i_atime.tv_nsec = btrfs_stack_timespec_nsec(&inode_item->atime);
18081806

1809-
tspec = btrfs_inode_mtime(inode_item);
1810-
inode->i_mtime.tv_sec = btrfs_stack_timespec_sec(tspec);
1811-
inode->i_mtime.tv_nsec = btrfs_stack_timespec_nsec(tspec);
1807+
inode->i_mtime.tv_sec = btrfs_stack_timespec_sec(&inode_item->mtime);
1808+
inode->i_mtime.tv_nsec = btrfs_stack_timespec_nsec(&inode_item->mtime);
18121809

1813-
tspec = btrfs_inode_ctime(inode_item);
1814-
inode->i_ctime.tv_sec = btrfs_stack_timespec_sec(tspec);
1815-
inode->i_ctime.tv_nsec = btrfs_stack_timespec_nsec(tspec);
1810+
inode->i_ctime.tv_sec = btrfs_stack_timespec_sec(&inode_item->ctime);
1811+
inode->i_ctime.tv_nsec = btrfs_stack_timespec_nsec(&inode_item->ctime);
18161812

18171813
inode->i_generation = BTRFS_I(inode)->generation;
18181814
BTRFS_I(inode)->index_cnt = (u64)-1;

‎fs/btrfs/inode.c

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3490,7 +3490,6 @@ static void btrfs_read_locked_inode(struct inode *inode)
34903490
struct btrfs_path *path;
34913491
struct extent_buffer *leaf;
34923492
struct btrfs_inode_item *inode_item;
3493-
struct btrfs_timespec *tspec;
34943493
struct btrfs_root *root = BTRFS_I(inode)->root;
34953494
struct btrfs_key location;
34963495
unsigned long ptr;
@@ -3527,17 +3526,14 @@ static void btrfs_read_locked_inode(struct inode *inode)
35273526
i_gid_write(inode, btrfs_inode_gid(leaf, inode_item));
35283527
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
35293528

3530-
tspec = btrfs_inode_atime(inode_item);
3531-
inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, tspec);
3532-
inode->i_atime.tv_nsec = btrfs_timespec_nsec(leaf, tspec);
3529+
inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);
3530+
inode->i_atime.tv_nsec = btrfs_timespec_nsec(leaf, &inode_item->atime);
35333531

3534-
tspec = btrfs_inode_mtime(inode_item);
3535-
inode->i_mtime.tv_sec = btrfs_timespec_sec(leaf, tspec);
3536-
inode->i_mtime.tv_nsec = btrfs_timespec_nsec(leaf, tspec);
3532+
inode->i_mtime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->mtime);
3533+
inode->i_mtime.tv_nsec = btrfs_timespec_nsec(leaf, &inode_item->mtime);
35373534

3538-
tspec = btrfs_inode_ctime(inode_item);
3539-
inode->i_ctime.tv_sec = btrfs_timespec_sec(leaf, tspec);
3540-
inode->i_ctime.tv_nsec = btrfs_timespec_nsec(leaf, tspec);
3535+
inode->i_ctime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->ctime);
3536+
inode->i_ctime.tv_nsec = btrfs_timespec_nsec(leaf, &inode_item->ctime);
35413537

35423538
inode_set_bytes(inode, btrfs_inode_nbytes(leaf, inode_item));
35433539
BTRFS_I(inode)->generation = btrfs_inode_generation(leaf, inode_item);
@@ -3658,19 +3654,19 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
36583654
btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
36593655
btrfs_set_token_inode_nlink(leaf, item, inode->i_nlink, &token);
36603656

3661-
btrfs_set_token_timespec_sec(leaf, btrfs_inode_atime(item),
3657+
btrfs_set_token_timespec_sec(leaf, &item->atime,
36623658
inode->i_atime.tv_sec, &token);
3663-
btrfs_set_token_timespec_nsec(leaf, btrfs_inode_atime(item),
3659+
btrfs_set_token_timespec_nsec(leaf, &item->atime,
36643660
inode->i_atime.tv_nsec, &token);
36653661

3666-
btrfs_set_token_timespec_sec(leaf, btrfs_inode_mtime(item),
3662+
btrfs_set_token_timespec_sec(leaf, &item->mtime,
36673663
inode->i_mtime.tv_sec, &token);
3668-
btrfs_set_token_timespec_nsec(leaf, btrfs_inode_mtime(item),
3664+
btrfs_set_token_timespec_nsec(leaf, &item->mtime,
36693665
inode->i_mtime.tv_nsec, &token);
36703666

3671-
btrfs_set_token_timespec_sec(leaf, btrfs_inode_ctime(item),
3667+
btrfs_set_token_timespec_sec(leaf, &item->ctime,
36723668
inode->i_ctime.tv_sec, &token);
3673-
btrfs_set_token_timespec_nsec(leaf, btrfs_inode_ctime(item),
3669+
btrfs_set_token_timespec_nsec(leaf, &item->ctime,
36743670
inode->i_ctime.tv_nsec, &token);
36753671

36763672
btrfs_set_token_inode_nbytes(leaf, item, inode_get_bytes(inode),

‎fs/btrfs/send.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2471,12 +2471,9 @@ verbose_printk("btrfs: send_utimes %llu\n", ino);
24712471
if (ret < 0)
24722472
goto out;
24732473
TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, p);
2474-
TLV_PUT_BTRFS_TIMESPEC(sctx, BTRFS_SEND_A_ATIME, eb,
2475-
btrfs_inode_atime(ii));
2476-
TLV_PUT_BTRFS_TIMESPEC(sctx, BTRFS_SEND_A_MTIME, eb,
2477-
btrfs_inode_mtime(ii));
2478-
TLV_PUT_BTRFS_TIMESPEC(sctx, BTRFS_SEND_A_CTIME, eb,
2479-
btrfs_inode_ctime(ii));
2474+
TLV_PUT_BTRFS_TIMESPEC(sctx, BTRFS_SEND_A_ATIME, eb, &ii->atime);
2475+
TLV_PUT_BTRFS_TIMESPEC(sctx, BTRFS_SEND_A_MTIME, eb, &ii->mtime);
2476+
TLV_PUT_BTRFS_TIMESPEC(sctx, BTRFS_SEND_A_CTIME, eb, &ii->ctime);
24802477
/* TODO Add otime support when the otime patches get into upstream */
24812478

24822479
ret = send_cmd(sctx);

‎fs/btrfs/tree-log.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3276,19 +3276,19 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
32763276
btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
32773277
btrfs_set_token_inode_nlink(leaf, item, inode->i_nlink, &token);
32783278

3279-
btrfs_set_token_timespec_sec(leaf, btrfs_inode_atime(item),
3279+
btrfs_set_token_timespec_sec(leaf, &item->atime,
32803280
inode->i_atime.tv_sec, &token);
3281-
btrfs_set_token_timespec_nsec(leaf, btrfs_inode_atime(item),
3281+
btrfs_set_token_timespec_nsec(leaf, &item->atime,
32823282
inode->i_atime.tv_nsec, &token);
32833283

3284-
btrfs_set_token_timespec_sec(leaf, btrfs_inode_mtime(item),
3284+
btrfs_set_token_timespec_sec(leaf, &item->mtime,
32853285
inode->i_mtime.tv_sec, &token);
3286-
btrfs_set_token_timespec_nsec(leaf, btrfs_inode_mtime(item),
3286+
btrfs_set_token_timespec_nsec(leaf, &item->mtime,
32873287
inode->i_mtime.tv_nsec, &token);
32883288

3289-
btrfs_set_token_timespec_sec(leaf, btrfs_inode_ctime(item),
3289+
btrfs_set_token_timespec_sec(leaf, &item->ctime,
32903290
inode->i_ctime.tv_sec, &token);
3291-
btrfs_set_token_timespec_nsec(leaf, btrfs_inode_ctime(item),
3291+
btrfs_set_token_timespec_nsec(leaf, &item->ctime,
32923292
inode->i_ctime.tv_nsec, &token);
32933293

32943294
btrfs_set_token_inode_nbytes(leaf, item, inode_get_bytes(inode),

0 commit comments

Comments
 (0)