From: ira.weiny@intel.com To: linux-kernel@vger.kernel.org Cc: Ira Weiny <ira.weiny@intel.com>, Alexander Viro <viro@zeniv.linux.org.uk>, "Darrick J. Wong" <darrick.wong@oracle.com>, Dan Williams <dan.j.williams@intel.com>, Dave Chinner <david@fromorbit.com>, Christoph Hellwig <hch@lst.de>, "Theodore Y. Ts'o" <tytso@mit.edu>, Jan Kara <jack@suse.cz>, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 11/12] fs/xfs: Clean up locking in dax invalidate Date: Sat, 8 Feb 2020 11:34:44 -0800 Message-ID: <20200208193445.27421-12-ira.weiny@intel.com> (raw) In-Reply-To: <20200208193445.27421-1-ira.weiny@intel.com> From: Ira Weiny <ira.weiny@intel.com> Define a variable to hold the lock flags to ensure that the correct locks are returned or released on error. Signed-off-by: Ira Weiny <ira.weiny@intel.com> --- fs/xfs/xfs_ioctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index faba232b1f31..0134c9e65efb 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1190,7 +1190,7 @@ xfs_ioctl_setattr_dax_invalidate( int *join_flags) { struct inode *inode = VFS_I(ip); - int error; + int error, flags; *join_flags = 0; @@ -1205,8 +1205,10 @@ xfs_ioctl_setattr_dax_invalidate( if (S_ISDIR(inode->i_mode)) return 0; + flags = XFS_MMAPLOCK_EXCL | XFS_IOLOCK_EXCL; + /* lock, flush and invalidate mapping in preparation for flag change */ - xfs_ilock(ip, XFS_MMAPLOCK_EXCL | XFS_IOLOCK_EXCL); + xfs_ilock(ip, flags); if ((fa->fsx_xflags & FS_XFLAG_DAX) == FS_XFLAG_DAX && !xfs_inode_supports_dax(ip)) { @@ -1229,11 +1231,11 @@ xfs_ioctl_setattr_dax_invalidate( if (error) goto out_unlock; - *join_flags = XFS_MMAPLOCK_EXCL | XFS_IOLOCK_EXCL; + *join_flags = flags; return 0; out_unlock: - xfs_iunlock(ip, XFS_MMAPLOCK_EXCL | XFS_IOLOCK_EXCL); + xfs_iunlock(ip, flags); return error; } -- 2.21.0
next prev parent reply index Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-08 19:34 [PATCH v3 00/12] Enable per-file/directory DAX operations V3 ira.weiny 2020-02-08 19:34 ` [PATCH v3 01/12] fs/stat: Define DAX statx attribute ira.weiny 2020-02-08 19:34 ` [PATCH v3 02/12] fs/xfs: Isolate the physical DAX flag from effective ira.weiny 2020-02-08 19:34 ` [PATCH v3 03/12] fs/xfs: Separate functionality of xfs_inode_supports_dax() ira.weiny 2020-02-11 5:47 ` Dave Chinner 2020-02-11 16:13 ` Ira Weiny 2020-02-08 19:34 ` [PATCH v3 04/12] fs/xfs: Clean up DAX support check ira.weiny 2020-02-11 5:57 ` Dave Chinner 2020-02-11 16:28 ` Ira Weiny 2020-02-11 20:38 ` Dave Chinner 2020-02-08 19:34 ` [PATCH v3 05/12] fs: remove unneeded IS_DAX() check ira.weiny 2020-02-11 5:34 ` Dave Chinner 2020-02-11 16:38 ` Ira Weiny 2020-02-11 20:41 ` Dave Chinner 2020-02-12 16:04 ` Ira Weiny 2020-02-08 19:34 ` [PATCH v3 06/12] fs/xfs: Check if the inode supports DAX under lock ira.weiny 2020-02-11 6:16 ` Dave Chinner 2020-02-11 17:55 ` Ira Weiny 2020-02-11 20:42 ` Dave Chinner 2020-02-12 16:10 ` Ira Weiny 2020-02-08 19:34 ` [PATCH v3 07/12] fs: Add locking for a dynamic DAX state ira.weiny 2020-02-11 8:00 ` Dave Chinner 2020-02-11 20:14 ` Ira Weiny 2020-02-11 20:59 ` Dan Williams 2020-02-11 21:49 ` Dave Chinner 2020-02-12 6:31 ` Darrick J. Wong 2020-02-08 19:34 ` [PATCH v3 08/12] fs/xfs: Clarify lockdep dependency for xfs_isilocked() ira.weiny 2020-02-08 19:34 ` [PATCH v3 09/12] fs/xfs: Add write DAX lock to xfs layer ira.weiny 2020-02-08 19:34 ` [PATCH v3 10/12] fs: Prevent DAX state change if file is mmap'ed ira.weiny 2020-02-08 19:34 ` ira.weiny [this message] 2020-02-08 19:34 ` [PATCH v3 12/12] fs/xfs: Allow toggle of effective DAX flag ira.weiny 2020-02-10 15:15 ` [PATCH v3 00/12] Enable per-file/directory DAX operations V3 Jeff Moyer 2020-02-11 20:17 ` Ira Weiny 2020-02-12 19:49 ` Jeff Moyer 2020-02-13 19:01 ` Ira Weiny 2020-02-13 19:05 ` Ira Weiny 2020-02-13 19:58 ` Darrick J. Wong 2020-02-13 23:29 ` Ira Weiny 2020-02-14 0:16 ` Dan Williams 2020-02-14 20:06 ` Ira Weiny 2020-02-14 21:23 ` Jeff Moyer 2020-02-14 21:58 ` Ira Weiny 2020-02-14 22:06 ` Jeff Moyer 2020-02-14 22:58 ` Jeff Moyer 2020-02-14 23:03 ` Jeff Moyer 2020-02-18 2:35 ` Ira Weiny 2020-02-18 14:22 ` Jeff Moyer 2020-02-18 23:54 ` Ira Weiny 2020-02-20 16:20 ` Ira Weiny 2020-02-20 16:30 ` Darrick J. Wong 2020-02-20 16:49 ` Ira Weiny 2020-02-20 17:00 ` Darrick J. Wong
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=20200208193445.27421-12-ira.weiny@intel.com \ --to=ira.weiny@intel.com \ --cc=dan.j.williams@intel.com \ --cc=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=hch@lst.de \ --cc=jack@suse.cz \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=tytso@mit.edu \ --cc=viro@zeniv.linux.org.uk \ /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
Linux-ext4 Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-ext4/0 linux-ext4/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-ext4 linux-ext4/ https://lore.kernel.org/linux-ext4 \ linux-ext4@vger.kernel.org public-inbox-index linux-ext4 Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-ext4 AGPL code for this site: git clone https://public-inbox.org/public-inbox.git