diff options
| author | Johannes Thumshirn | 2018-12-05 15:23:03 +0100 |
|---|---|---|
| committer | David Sterba | 2018-12-17 14:51:45 +0100 |
| commit | 7073017aeb98db311ca407f0f552f2bfc1af3015 (patch) | |
| tree | 55437b78aa398fc0b50224e6cd5af3e35dce0e5d /fs/btrfs/volumes.c | |
| parent | btrfs: dev-replace: open code trivial locking helpers (diff) | |
| download | kernel-qcow2-linux-7073017aeb98db311ca407f0f552f2bfc1af3015.tar.gz kernel-qcow2-linux-7073017aeb98db311ca407f0f552f2bfc1af3015.tar.xz kernel-qcow2-linux-7073017aeb98db311ca407f0f552f2bfc1af3015.zip | |
btrfs: use offset_in_page instead of open-coding it
Constructs like 'var & (PAGE_SIZE - 1)' or 'var & ~PAGE_MASK' can denote an
offset into a page.
So replace them by the offset_in_page() macro instead of open-coding it if
they're not used as an alignment check.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 367787670c9b..9956c53f18f6 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1436,7 +1436,7 @@ static int btrfs_read_disk_super(struct block_device *bdev, u64 bytenr, p = kmap(*page); /* align our pointer to the offset of the super block */ - *disk_super = p + (bytenr & ~PAGE_MASK); + *disk_super = p + offset_in_page(bytenr); if (btrfs_super_bytenr(*disk_super) != bytenr || btrfs_super_magic(*disk_super) != BTRFS_MAGIC) { |