From: David Sterba Date: Sun, 6 Jul 2025 18:23:58 +0000 (+0200) Subject: btrfs: accessors: rename variable for folio offset X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72b2b199d5ee659ceb439192db4618f47c61eeef;p=thirdparty%2Flinux.git btrfs: accessors: rename variable for folio offset There used to be 'oip' short for offset in page, which got changed during conversion to folios, the name is a bit confusing so rename it. Signed-off-by: David Sterba --- diff --git a/fs/btrfs/accessors.c b/fs/btrfs/accessors.c index f554c4f723617..861c7d92c437a 100644 --- a/fs/btrfs/accessors.c +++ b/fs/btrfs/accessors.c @@ -54,10 +54,10 @@ u##bits btrfs_get_##bits(const struct extent_buffer *eb, \ { \ const unsigned long member_offset = (unsigned long)ptr + off; \ const unsigned long idx = get_eb_folio_index(eb, member_offset);\ - const unsigned long oil = get_eb_offset_in_folio(eb, \ + const unsigned long oif = get_eb_offset_in_folio(eb, \ member_offset);\ - char *kaddr = folio_address(eb->folios[idx]) + oil; \ - const int part = eb->folio_size - oil; \ + char *kaddr = folio_address(eb->folios[idx]) + oif; \ + const int part = eb->folio_size - oif; \ u8 lebytes[sizeof(u##bits)]; \ \ if (unlikely(member_offset + sizeof(u##bits) > eb->len)) { \ @@ -84,10 +84,10 @@ void btrfs_set_##bits(const struct extent_buffer *eb, void *ptr, \ { \ const unsigned long member_offset = (unsigned long)ptr + off; \ const unsigned long idx = get_eb_folio_index(eb, member_offset);\ - const unsigned long oil = get_eb_offset_in_folio(eb, \ + const unsigned long oif = get_eb_offset_in_folio(eb, \ member_offset);\ - char *kaddr = folio_address(eb->folios[idx]) + oil; \ - const int part = eb->folio_size - oil; \ + char *kaddr = folio_address(eb->folios[idx]) + oif; \ + const int part = eb->folio_size - oif; \ u8 lebytes[sizeof(u##bits)]; \ \ if (unlikely(member_offset + sizeof(u##bits) > eb->len)) { \