public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: Jan Kara <jack@suse.cz>, Surbhi Palande <csurbhi@gmail.com>,
	Kamal Mostafa <kamal@canonical.com>,
	Eric Sandeen <sandeen@sandeen.net>,
	LKML <linux-kernel@vger.kernel.org>,
	xfs@oss.sgi.com, Christoph Hellwig <hch@infradead.org>,
	Dave Chinner <dchinner@redhat.com>, Theodore Ts'o <tytso@mit.edu>,
	linux-ext4@vger.kernel.org
Subject: [PATCH 3/4] ext4: Protect ext4_page_mkwrite with sb_start_write - sb_end_write
Date: Thu, 12 Jan 2012 02:20:52 +0100	[thread overview]
Message-ID: <1326331253-6497-4-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1326331253-6497-1-git-send-email-jack@suse.cz>

Since ext4_page_mkwrite() calls into __block_page_mkwrite() it has to
provide freezing protection on it's own.

CC: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/ext4/inode.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 848f436..fbe998b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4733,11 +4733,7 @@ int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 	get_block_t *get_block;
 	int retries = 0;
 
-	/*
-	 * This check is racy but catches the common case. We rely on
-	 * __block_page_mkwrite() to do a reliable check.
-	 */
-	vfs_check_frozen(inode->i_sb, SB_FREEZE_WRITE);
+	sb_start_write(inode->i_sb);
 	/* Delalloc case is easy... */
 	if (test_opt(inode->i_sb, DELALLOC) &&
 	    !ext4_should_journal_data(inode) &&
@@ -4805,5 +4801,6 @@ retry_alloc:
 out_ret:
 	ret = block_page_mkwrite_return(ret);
 out:
+	sb_end_write(inode->i_sb);
 	return ret;
 }
-- 
1.7.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2012-01-12  1:21 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-12  1:20 [PATCH 0/4] Fix filesystem freezing Jan Kara
2012-01-12  1:20 ` [PATCH 1/4] fs: Improve filesystem freezing handling Jan Kara
2012-01-12 19:53   ` Andreas Dilger
2012-01-12 20:07     ` Jan Kara
2012-01-12 22:57   ` Eric Sandeen
2012-01-12 23:15     ` Jan Kara
2012-01-13  1:26   ` Dave Chinner
2012-01-13 10:12     ` Jan Kara
2012-01-12  1:20 ` [PATCH 2/4] vfs: Protect write paths by sb_start_write - sb_end_write Jan Kara
2012-01-12 19:56   ` Andreas Dilger
2012-01-12 20:11     ` Jan Kara
2012-01-12  1:20 ` Jan Kara [this message]
2012-01-12  1:20 ` [PATCH 4/4] xfs: Protect xfs_file_aio_write() with " Jan Kara
2012-01-12 21:29   ` Al Viro
2012-01-12 21:36     ` Jan Kara
2012-01-12  2:48 ` [PATCH 0/4] Fix filesystem freezing Dave Chinner
2012-01-12 11:30   ` Jan Kara
2012-01-13  0:09     ` Dave Chinner
2012-01-13 11:07       ` Jan Kara
2012-01-12 20:48 ` Ted Ts'o
2012-01-12 21:38   ` Jan Kara

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=1326331253-6497-4-git-send-email-jack@suse.cz \
    --to=jack@suse.cz \
    --cc=csurbhi@gmail.com \
    --cc=dchinner@redhat.com \
    --cc=hch@infradead.org \
    --cc=kamal@canonical.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sandeen@sandeen.net \
    --cc=tytso@mit.edu \
    --cc=xfs@oss.sgi.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox