fs/bcachefs/journal_io.c:1839 bch2_journal_write_pick_flush() warn: inconsistent indenting

From: kernel test robot
Date: Wed Nov 08 2023 - 17:33:48 EST


tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: 90450a06162e6c71ab813ea22a83196fe7cff4bc
commit: 80396a47490936f73729548310ad60e9f5df61c9 bcachefs: Break up bch2_journal_write()
date: 3 days ago
config: i386-randconfig-141-20231108 (https://download.01.org/0day-ci/archive/20231109/202311090619.Ug0DltWc-lkp@xxxxxxxxx/config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce: (https://download.01.org/0day-ci/archive/20231109/202311090619.Ug0DltWc-lkp@xxxxxxxxx/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@xxxxxxxxx>
| Closes: https://lore.kernel.org/oe-kbuild-all/202311090619.Ug0DltWc-lkp@xxxxxxxxx/

New smatch warnings:
fs/bcachefs/journal_io.c:1839 bch2_journal_write_pick_flush() warn: inconsistent indenting

Old smatch warnings:
fs/bcachefs/journal_io.c:132 journal_entry_add() warn: missing error code 'ret'

vim +1839 fs/bcachefs/journal_io.c

1808
1809 static int bch2_journal_write_pick_flush(struct journal *j, struct journal_buf *w)
1810 {
1811 struct bch_fs *c = container_of(j, struct bch_fs, journal);
1812 int error = bch2_journal_error(j);
1813
1814 /*
1815 * If the journal is in an error state - we did an emergency shutdown -
1816 * we prefer to continue doing journal writes. We just mark them as
1817 * noflush so they'll never be used, but they'll still be visible by the
1818 * list_journal tool - this helps in debugging.
1819 *
1820 * There's a caveat: the first journal write after marking the
1821 * superblock dirty must always be a flush write, because on startup
1822 * from a clean shutdown we didn't necessarily read the journal and the
1823 * new journal write might overwrite whatever was in the journal
1824 * previously - we can't leave the journal without any flush writes in
1825 * it.
1826 *
1827 * So if we're in an error state, and we're still starting up, we don't
1828 * write anything at all.
1829 */
1830 if (error && test_bit(JOURNAL_NEED_FLUSH_WRITE, &j->flags))
1831 return -EIO;
1832
1833 if (error ||
1834 w->noflush ||
1835 (!w->must_flush &&
1836 (jiffies - j->last_flush_write) < msecs_to_jiffies(c->opts.journal_flush_delay) &&
1837 test_bit(JOURNAL_MAY_SKIP_FLUSH, &j->flags))) {
1838 w->noflush = true;
> 1839 SET_JSET_NO_FLUSH(w->data, true);
1840 w->data->last_seq = 0;
1841 w->last_seq = 0;
1842
1843 j->nr_noflush_writes++;
1844 } else {
1845 j->last_flush_write = jiffies;
1846 j->nr_flush_writes++;
1847 clear_bit(JOURNAL_NEED_FLUSH_WRITE, &j->flags);
1848 }
1849
1850 return 0;
1851 }
1852

--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki