| Message ID | 20210607175558.3343945-1-leah.rumancik@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ext4: fix input checking in fs/jbd2/journal.c | expand |
On Mon, Jun 07, 2021 at 05:55:58PM +0000, Leah Rumancik wrote: > Update > > if (JBD2_JOURNAL_FLUSH_DISCARD & !blk_queue_discard(q)) > > to use && instead of &. JBD2_JOURNAL_FLUSH_DISCARD is set to 1 so & > technically works but && could be a bit faster and will maintain > correctness in the event the value of JBD2_JOURNAL_FLUSH_DISCARD is > updated. > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > > Signed-off-by: Leah Rumancik <leah.rumancik@gmail.com> Thanks, I've folded this fix into the base commit. - Ted
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 521ce41c242c..f0636180b624 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1715,7 +1715,7 @@ static int __jbd2_journal_erase(journal_t *journal, unsigned int flags) if (!q) return -ENXIO; - if (JBD2_JOURNAL_FLUSH_DISCARD & !blk_queue_discard(q)) + if (JBD2_JOURNAL_FLUSH_DISCARD && !blk_queue_discard(q)) return -EOPNOTSUPP; /*
Update if (JBD2_JOURNAL_FLUSH_DISCARD & !blk_queue_discard(q)) to use && instead of &. JBD2_JOURNAL_FLUSH_DISCARD is set to 1 so & technically works but && could be a bit faster and will maintain correctness in the event the value of JBD2_JOURNAL_FLUSH_DISCARD is updated. Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Leah Rumancik <leah.rumancik@gmail.com> --- fs/jbd2/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)