From: Leah Rumancik <leah.rumancik@gmail.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: linux-ext4@vger.kernel.org, tytso@mit.edu
Subject: Re: [PATCH v3 1/3] ext4: add flags argument to jbd2_journal_flush
Date: Thu, 6 May 2021 10:15:51 -0400 [thread overview]
Message-ID: <YJP6F2gSju92kMaU@google.com> (raw)
In-Reply-To: <20210505213717.GC8532@magnolia>
On Wed, May 05, 2021 at 02:37:17PM -0700, Darrick J. Wong wrote:
> On Tue, May 04, 2021 at 04:35:48PM +0000, Leah Rumancik wrote:
> > This patch will allow the following commit to pass a discard flag,
> > enabling discarding the journal blocks while flushing the journal.
> >
> > Signed-off-by: Leah Rumancik <leah.rumancik@gmail.com>
> > ---
> > fs/ext4/inode.c | 4 ++--
> > fs/ext4/ioctl.c | 6 +++---
> > fs/ext4/super.c | 6 +++---
> > fs/jbd2/journal.c | 3 +--
> > fs/ocfs2/alloc.c | 2 +-
> > fs/ocfs2/journal.c | 8 ++++----
> > include/linux/jbd2.h | 2 +-
> > 7 files changed, 15 insertions(+), 16 deletions(-)
> >
> > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> > index 0948a43f1b3d..d308c57559e3 100644
> > --- a/fs/ext4/inode.c
> > +++ b/fs/ext4/inode.c
> > @@ -3225,7 +3225,7 @@ static sector_t ext4_bmap(struct address_space *mapping, sector_t block)
> > ext4_clear_inode_state(inode, EXT4_STATE_JDATA);
> > journal = EXT4_JOURNAL(inode);
> > jbd2_journal_lock_updates(journal);
> > - err = jbd2_journal_flush(journal);
> > + err = jbd2_journal_flush(journal, false);
> > jbd2_journal_unlock_updates(journal);
> >
> > if (err)
> > @@ -6007,7 +6007,7 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)
> > if (val)
> > ext4_set_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);
> > else {
> > - err = jbd2_journal_flush(journal);
> > + err = jbd2_journal_flush(journal, false);
> > if (err < 0) {
> > jbd2_journal_unlock_updates(journal);
> > percpu_up_write(&sbi->s_writepages_rwsem);
> > diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
> > index e9b0a1fa2ba8..ef809feb7e77 100644
> > --- a/fs/ext4/ioctl.c
> > +++ b/fs/ext4/ioctl.c
> > @@ -701,7 +701,7 @@ static long ext4_ioctl_group_add(struct file *file,
> > err = ext4_group_add(sb, input);
> > if (EXT4_SB(sb)->s_journal) {
> > jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal);
> > - err2 = jbd2_journal_flush(EXT4_SB(sb)->s_journal);
> > + err2 = jbd2_journal_flush(EXT4_SB(sb)->s_journal, false);
> > jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal);
> > }
> > if (err == 0)
> > @@ -879,7 +879,7 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
> > err = ext4_group_extend(sb, EXT4_SB(sb)->s_es, n_blocks_count);
> > if (EXT4_SB(sb)->s_journal) {
> > jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal);
> > - err2 = jbd2_journal_flush(EXT4_SB(sb)->s_journal);
> > + err2 = jbd2_journal_flush(EXT4_SB(sb)->s_journal, false);
> > jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal);
> > }
> > if (err == 0)
> > @@ -1022,7 +1022,7 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
> > if (EXT4_SB(sb)->s_journal) {
> > ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_RESIZE);
> > jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal);
> > - err2 = jbd2_journal_flush(EXT4_SB(sb)->s_journal);
> > + err2 = jbd2_journal_flush(EXT4_SB(sb)->s_journal, false);
> > jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal);
> > }
> > if (err == 0)
> > diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> > index 3868377dec2d..449ed222cdf8 100644
> > --- a/fs/ext4/super.c
> > +++ b/fs/ext4/super.c
> > @@ -5613,7 +5613,7 @@ static int ext4_mark_recovery_complete(struct super_block *sb,
> > return 0;
> > }
> > jbd2_journal_lock_updates(journal);
> > - err = jbd2_journal_flush(journal);
> > + err = jbd2_journal_flush(journal, false);
> > if (err < 0)
> > goto out;
> >
> > @@ -5755,7 +5755,7 @@ static int ext4_freeze(struct super_block *sb)
> > * Don't clear the needs_recovery flag if we failed to
> > * flush the journal.
> > */
> > - error = jbd2_journal_flush(journal);
> > + error = jbd2_journal_flush(journal, false);
> > if (error < 0)
> > goto out;
> >
> > @@ -6346,7 +6346,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
> > * otherwise be livelocked...
> > */
> > jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal);
> > - err = jbd2_journal_flush(EXT4_SB(sb)->s_journal);
> > + err = jbd2_journal_flush(EXT4_SB(sb)->s_journal, false);
> > jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal);
> > if (err)
> > return err;
> > diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> > index 2dc944442802..4b7953934c82 100644
> > --- a/fs/jbd2/journal.c
> > +++ b/fs/jbd2/journal.c
> > @@ -2251,8 +2251,7 @@ EXPORT_SYMBOL(jbd2_journal_clear_features);
> > * Filesystems can use this when remounting readonly to ensure that
> > * recovery does not need to happen on remount.
> > */
> > -
> > -int jbd2_journal_flush(journal_t *journal)
> > +int jbd2_journal_flush(journal_t *journal, bool discard)
> > {
> > int err = 0;
> > transaction_t *transaction = NULL;
>
> The division of code between patches 1 and 2 is a bit ... unusual?
>
> I would have had patch 1 actually wire up this parameter, and put the
> userspace ioctl additions in patch 2.
>
> At any rate, I defer to Ted; if he told you to do it this way, then it's
> fine with me, no need to churn your series for the same end-result.
>
> --D
I knew they needed to be split but wasn't sure how. Felt weird to
include the __jbd2_issue_discard function when no one is using it, but I
do agree it is even weirder to have a parameter that isn't attached to
anything. I'm reworking the patches anyways so I'll reorganize this,
thanks!
-Leah
>
> > diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
> > index 78710788c237..5ff2c42cb46c 100644
> > --- a/fs/ocfs2/alloc.c
> > +++ b/fs/ocfs2/alloc.c
> > @@ -6020,7 +6020,7 @@ int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
> > * Then truncate log will be replayed resulting in cluster double free.
> > */
> > jbd2_journal_lock_updates(journal->j_journal);
> > - status = jbd2_journal_flush(journal->j_journal);
> > + status = jbd2_journal_flush(journal->j_journal, false);
> > jbd2_journal_unlock_updates(journal->j_journal);
> > if (status < 0) {
> > mlog_errno(status);
> > diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
> > index db52e843002a..1c356b29c66d 100644
> > --- a/fs/ocfs2/journal.c
> > +++ b/fs/ocfs2/journal.c
> > @@ -310,7 +310,7 @@ static int ocfs2_commit_cache(struct ocfs2_super *osb)
> > }
> >
> > jbd2_journal_lock_updates(journal->j_journal);
> > - status = jbd2_journal_flush(journal->j_journal);
> > + status = jbd2_journal_flush(journal->j_journal, false);
> > jbd2_journal_unlock_updates(journal->j_journal);
> > if (status < 0) {
> > up_write(&journal->j_trans_barrier);
> > @@ -1002,7 +1002,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
> >
> > if (ocfs2_mount_local(osb)) {
> > jbd2_journal_lock_updates(journal->j_journal);
> > - status = jbd2_journal_flush(journal->j_journal);
> > + status = jbd2_journal_flush(journal->j_journal, false);
> > jbd2_journal_unlock_updates(journal->j_journal);
> > if (status < 0)
> > mlog_errno(status);
> > @@ -1072,7 +1072,7 @@ int ocfs2_journal_load(struct ocfs2_journal *journal, int local, int replayed)
> >
> > if (replayed) {
> > jbd2_journal_lock_updates(journal->j_journal);
> > - status = jbd2_journal_flush(journal->j_journal);
> > + status = jbd2_journal_flush(journal->j_journal, false);
> > jbd2_journal_unlock_updates(journal->j_journal);
> > if (status < 0)
> > mlog_errno(status);
> > @@ -1668,7 +1668,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb,
> >
> > /* wipe the journal */
> > jbd2_journal_lock_updates(journal);
> > - status = jbd2_journal_flush(journal);
> > + status = jbd2_journal_flush(journal, false);
> > jbd2_journal_unlock_updates(journal);
> > if (status < 0)
> > mlog_errno(status);
> > diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> > index 99d3cd051ac3..5e4349b76997 100644
> > --- a/include/linux/jbd2.h
> > +++ b/include/linux/jbd2.h
> > @@ -1491,7 +1491,7 @@ extern int jbd2_journal_invalidatepage(journal_t *,
> > struct page *, unsigned int, unsigned int);
> > extern int jbd2_journal_try_to_free_buffers(journal_t *journal, struct page *page);
> > extern int jbd2_journal_stop(handle_t *);
> > -extern int jbd2_journal_flush (journal_t *);
> > +extern int jbd2_journal_flush(journal_t *journal, bool discard);
> > extern void jbd2_journal_lock_updates (journal_t *);
> > extern void jbd2_journal_unlock_updates (journal_t *);
> >
> > --
> > 2.31.1.527.g47e6f16901-goog
> >
prev parent reply other threads:[~2021-05-06 14:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 16:35 [PATCH v3 1/3] ext4: add flags argument to jbd2_journal_flush Leah Rumancik
2021-05-04 16:35 ` [PATCH v3 2/3] ext4: add ioctl EXT4_IOC_CHECKPOINT Leah Rumancik
2021-05-05 16:55 ` harshad shirwadkar
2021-05-05 21:31 ` Darrick J. Wong
2021-05-05 21:27 ` Darrick J. Wong
2021-05-05 22:08 ` Darrick J. Wong
2021-05-06 15:58 ` Darrick J. Wong
2021-05-06 18:18 ` Leah Rumancik
2021-05-07 16:22 ` harshad shirwadkar
2021-05-11 17:11 ` harshad shirwadkar
2021-05-06 7:18 ` Christoph Hellwig
2021-05-06 15:08 ` Darrick J. Wong
2021-05-04 16:35 ` [PATCH v3 3/3] ext4: update journal documentation Leah Rumancik
2021-05-05 22:08 ` Darrick J. Wong
2021-05-05 21:37 ` [PATCH v3 1/3] ext4: add flags argument to jbd2_journal_flush Darrick J. Wong
2021-05-06 14:15 ` Leah Rumancik [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YJP6F2gSju92kMaU@google.com \
--to=leah.rumancik@gmail.com \
--cc=djwong@kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.