From patchwork Sat Feb 4 04:30:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 139528 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8C8A7104792 for ; Sat, 4 Feb 2012 15:30:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753038Ab2BDEaH (ORCPT ); Fri, 3 Feb 2012 23:30:07 -0500 Received: from sandeen.net ([63.231.237.45]:40922 "EHLO mail.sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751950Ab2BDEaH (ORCPT ); Fri, 3 Feb 2012 23:30:07 -0500 Received: from liberator.sandeen.net (liberator.sandeen.net [10.0.0.4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sandeen.net (Postfix) with ESMTP id BEE77496334E; Fri, 3 Feb 2012 22:30:05 -0600 (CST) Message-ID: <4F2CB44D.4060006@sandeen.net> Date: Fri, 03 Feb 2012 22:30:05 -0600 From: Eric Sandeen User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0) Gecko/20120129 Thunderbird/10.0 MIME-Version: 1.0 To: Jan Kara CC: linux-fsdevel@vger.kernel.org, Dave Chinner , Surbhi Palande , Kamal Mostafa , Christoph Hellwig , LKML , xfs@oss.sgi.com, linux-ext4@vger.kernel.org, Ben Myers , Alex Elder Subject: Re: [PATCH 5/8] xfs: Protect xfs_file_aio_write() & xfs_setattr_size() with sb_start_write - sb_end_write References: <1327091686-23177-1-git-send-email-jack@suse.cz> <1327091686-23177-6-git-send-email-jack@suse.cz> In-Reply-To: <1327091686-23177-6-git-send-email-jack@suse.cz> X-Enigmail-Version: 1.3.5 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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. -Eric --- 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 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: