]> asedeno.scripts.mit.edu Git - linux.git/commit
btrfs: let the assertion expression compile in all configs
authorAnders Roxell <anders.roxell@linaro.org>
Tue, 29 Jan 2019 13:01:46 +0000 (14:01 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 25 Feb 2019 13:13:28 +0000 (14:13 +0100)
commit2eec5f004205be12b5a35628236b593fe1d1cbd5
treeff7673b59e4b842673afd7bf766de1cfa2fcd99e
parent766ece54f4c9c29b25eabd091a2ee939feb1669e
btrfs: let the assertion expression compile in all configs

A compiler warning (in a patch in development) pointed to a variable
that was used only inside and ASSERT:

  u64 root_objectid = root->root_key.objectid;
  ASSERT(root_objectid == ...);

  fs/btrfs/relocation.c: In function ‘insert_dirty_subv’:
  fs/btrfs/relocation.c:2138:6: warning: unused variable ‘root_objectid’ [-Wunused-variable]
    u64 root_objectid = root->root_key.objectid;
^~~~~~~~~~~~~

When CONFIG_BRTFS_ASSERT isn't enabled, variable root_objectid isn't used.

Rework the assertion helper by adding a runtime check instead of the
'#ifdef CONFIG_BTRFS_ASSERT #else ...", so the compiler sees the
condition being passed into an inline function after preprocessing.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Reviewed-by: David Sterba <dsterba@suse.com>
[ update changelog ]
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/ctree.h