mainline inclusion
from mainline-4.20-rc1
commit 18127429a854e7607b859484880b8e26cee9ddab
category: bugfix
bugzilla: 5559
CVE: NA

---------------------------

Unprotected naming of local variables within the set_mask_bits() can easily
lead to using the wrong scope.

Noticed this when "set_mask_bits(&foo->bar, 0, mask)" behaved as no-op.
Signed-off-by: NMiklos Szeredi <mszeredi@redhat.com>
Fixes: 00a1a053 ("ext4: atomically set inode->i_flags in ext4_set_inode_flags()")
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: NJason Yan <yanaijie@huawei.com>
Reviewed-by: Nzhengbin <zhengbin13@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>