From: Eric Sandeen <sandeen@redhat.com>
To: Eric Sandeen <sandeen@sandeen.net>
Cc: Jan Kara <jack@suse.cz>,
linux-fsdevel@vger.kernel.org, Dave Chinner <dchinner@redhat.com>,
Surbhi Palande <csurbhi@gmail.com>,
Kamal Mostafa <kamal@canonical.com>,
Christoph Hellwig <hch@infradead.org>,
LKML <linux-kernel@vger.kernel.org>,
xfs@oss.sgi.com, linux-ext4@vger.kernel.org,
Ben Myers <bpm@sgi.com>, Alex Elder <elder@kernel.org>
Subject: Re: [PATCH 5/8] xfs: Protect xfs_file_aio_write() & xfs_setattr_size() with sb_start_write - sb_end_write
Date: Fri, 03 Feb 2012 22:50:48 -0600 [thread overview]
Message-ID: <4F2CB928.7030001@redhat.com> (raw)
In-Reply-To: <4F2CB44D.4060006@sandeen.net>
On 2/3/12 10:30 PM, Eric Sandeen wrote:
> On 1/20/12 2:34 PM, Jan Kara wrote:
>> Replace racy xfs_wait_for_freeze() check in xfs_file_aio_write() with
>> a reliable sb_start_write() - sb_end_write() locking.
>
> Here's what I'm running with now. With this and my modified
> patch6, I can pass xfstests 068 on xfs.
(and I dropped patch 4, with the lock rearrangement, FWIW - so
the only xfs patches I'm running are the 2 I resent).
-Eric
> -Eric
>
>
>
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index 7e5bc87..f1cacdc 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -874,11 +874,11 @@ xfs_file_aio_write(
> if (ocount == 0)
> return 0;
>
> - xfs_wait_for_freeze(ip->i_mount, SB_FREEZE_WRITE);
> -
> if (XFS_FORCED_SHUTDOWN(ip->i_mount))
> return -EIO;
>
> + sb_start_write(inode->i_sb, SB_FREEZE_WRITE);
> +
> if (unlikely(file->f_flags & O_DIRECT))
> ret = xfs_file_dio_aio_write(iocb, iovp, nr_segs, pos, ocount);
> else
> @@ -895,6 +895,7 @@ xfs_file_aio_write(
> if (err < 0)
> ret = err;
> }
> + sb_end_write(inode->i_sb, SB_FREEZE_WRITE);
>
> return ret;
> }
> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> index ab30253..7f3fa17 100644
> --- a/fs/xfs/xfs_iops.c
> +++ b/fs/xfs/xfs_iops.c
> @@ -773,6 +773,7 @@ xfs_setattr_size(
> ATTR_MTIME_SET|ATTR_KILL_SUID|ATTR_KILL_SGID|
> ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0);
>
> + sb_start_write(inode->i_sb, SB_FREEZE_WRITE);
> lock_flags = XFS_ILOCK_EXCL;
> if (!(flags & XFS_ATTR_NOLOCK))
> lock_flags |= XFS_IOLOCK_EXCL;
> @@ -792,6 +793,7 @@ xfs_setattr_size(
> * Use the regular setattr path to update the timestamps.
> */
> xfs_iunlock(ip, lock_flags);
> + sb_end_write(inode->i_sb, SB_FREEZE_WRITE);
> iattr->ia_valid &= ~ATTR_SIZE;
> return xfs_setattr_nonsize(ip, iattr, 0);
> }
> @@ -938,6 +940,7 @@ xfs_setattr_size(
> out_unlock:
> if (lock_flags)
> xfs_iunlock(ip, lock_flags);
> + sb_end_write(inode->i_sb, SB_FREEZE_WRITE);
> return error;
>
> out_trans_abort:
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-02-04 4:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 20:34 [PATCH 0/8] Fix filesystem freezing Jan Kara
2012-01-20 20:34 ` [PATCH 1/8] fs: Improve filesystem freezing handling Jan Kara
2012-02-04 3:03 ` Eric Sandeen
2012-02-06 15:17 ` Jan Kara
2012-01-20 20:34 ` [PATCH 2/8] vfs: Protect write paths by sb_start_write - sb_end_write Jan Kara
2012-01-24 8:21 ` Dave Chinner
2012-01-24 11:44 ` Jan Kara
2012-02-05 6:13 ` Eric Sandeen
2012-02-06 15:33 ` Jan Kara
2012-01-20 20:34 ` [PATCH 3/8] ext4: Protect ext4_page_mkwrite & ext4_setattr with " Jan Kara
2012-01-20 20:34 ` [PATCH 4/8] xfs: Move ilock before transaction start in xfs_setattr_size() Jan Kara
2012-01-24 6:59 ` Dave Chinner
2012-01-24 11:52 ` Jan Kara
2012-01-20 20:34 ` [PATCH 5/8] xfs: Protect xfs_file_aio_write() & xfs_setattr_size() with sb_start_write - sb_end_write Jan Kara
2012-01-24 7:19 ` Dave Chinner
2012-01-24 19:35 ` Jan Kara
2012-02-04 4:30 ` Eric Sandeen
2012-02-04 4:50 ` Eric Sandeen [this message]
2012-02-05 23:11 ` Dave Chinner
2012-01-20 20:34 ` [PATCH 6/8] xfs: Use generic writers counter instead of m_active_trans counter Jan Kara
2012-01-24 8:05 ` Dave Chinner
2012-02-04 2:13 ` Eric Sandeen
2012-02-04 2:42 ` Eric Sandeen
2012-02-04 4:34 ` Eric Sandeen
2012-01-20 20:34 ` [PATCH 7/8] Documentation: Correct s_umount state for freeze_fs/unfreeze_fs Jan Kara
2012-01-20 20:34 ` [PATCH 8/8] vfs: Document s_frozen state through freeze_super 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=4F2CB928.7030001@redhat.com \
--to=sandeen@redhat.com \
--cc=bpm@sgi.com \
--cc=csurbhi@gmail.com \
--cc=dchinner@redhat.com \
--cc=elder@kernel.org \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--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=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;
as well as URLs for NNTP newsgroup(s).