Btrfs: free space cache: make sure there is always room for generation number
authorZhihui Zhang <zzhsuny@gmail.com>
Tue, 3 Jul 2018 00:00:54 +0000 (20:00 -0400)
committerDavid Sterba <dsterba@suse.com>
Mon, 6 Aug 2018 11:12:42 +0000 (13:12 +0200)
io_ctl_set_generation() assumes that the generation number shares
the same page with inline CRCs. Let's make sure this is always true.

Signed-off-by: Zhihui Zhang <zzhsuny@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/free-space-cache.c

index d5f80cb300bea03a2a417fd5cc03d55c960f8314..d2c0bdbd79ecbf7c2c0546394584cb8775513ec5 100644 (file)
@@ -300,9 +300,9 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode,
        if (btrfs_ino(BTRFS_I(inode)) != BTRFS_FREE_INO_OBJECTID)
                check_crcs = 1;
 
-       /* Make sure we can fit our crcs into the first page */
+       /* Make sure we can fit our crcs and generation into the first page */
        if (write && check_crcs &&
-           (num_pages * sizeof(u32)) >= PAGE_SIZE)
+           (num_pages * sizeof(u32) + sizeof(u64)) > PAGE_SIZE)
                return -ENOSPC;
 
        memset(io_ctl, 0, sizeof(struct btrfs_io_ctl));