From patchwork Sat May 14 00:02:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Derrick X-Patchwork-Id: 9094231 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 137FDBF29F for ; Sat, 14 May 2016 00:04:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 344972025A for ; Sat, 14 May 2016 00:04:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 216C420220 for ; Sat, 14 May 2016 00:04:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932276AbcENAEd (ORCPT ); Fri, 13 May 2016 20:04:33 -0400 Received: from mga02.intel.com ([134.134.136.20]:60633 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932116AbcENAE3 (ORCPT ); Fri, 13 May 2016 20:04:29 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 13 May 2016 17:04:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,615,1455004800"; d="scan'208";a="976113483" Received: from eremita.lm.intel.com ([10.232.112.176]) by orsmga002.jf.intel.com with ESMTP; 13 May 2016 17:04:07 -0700 From: Jon Derrick To: linux-block@vger.kernel.org Cc: Jon Derrick , "Jens Axboe" , "Alexander Viro" , linux-fsdevel@vger.kernel.org, "Dan Williams" , "Jeff Moyer" , "Stephen Bates" , "Keith Busch" , linux-nvme@lists.infradead.org, "Christoph Hellwig" Subject: [RFCv2 2/3] block: add helper for setting and clearing S_DAX on inode Date: Fri, 13 May 2016 18:02:47 -0600 Message-Id: <1463184168-3381-3-git-send-email-jonathan.derrick@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463184168-3381-1-git-send-email-jonathan.derrick@intel.com> References: <1463184168-3381-1-git-send-email-jonathan.derrick@intel.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP inode->i_flags locking rules suggest using the i_mutex lock. This patch adds a helper to do the locking and setting of S_DAX on the block device inode. Signed-off-by: Jon Derrick --- fs/block_dev.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index d4fa725..252e459 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1159,6 +1159,18 @@ void bd_set_size(struct block_device *bdev, loff_t size) } EXPORT_SYMBOL(bd_set_size); +static void bd_set_dax(struct block_device *bdev, bool enabled) +{ + struct inode *inode = bdev->bd_inode; + + inode_lock(inode); + if (enabled) + inode->i_flags = S_DAX; + else + inode->i_flags &= ~S_DAX; + inode_unlock(inode); +} + static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part); /* @@ -1206,9 +1218,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) bdev->bd_queue = disk->queue; bdev->bd_contains = bdev; if (IS_ENABLED(CONFIG_BLK_DEV_DAX) && disk->fops->direct_access) - bdev->bd_inode->i_flags = S_DAX; + bd_set_dax(bdev, 1); else - bdev->bd_inode->i_flags &= ~S_DAX; + bd_set_dax(bdev, 0); if (!partno) { ret = -ENXIO; @@ -1239,7 +1251,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) if (!ret) { bd_set_size(bdev,(loff_t)get_capacity(disk)<<9); if (!blkdev_dax_capable(bdev)) - bdev->bd_inode->i_flags &= ~S_DAX; + bd_set_dax(bdev, 0); } /* @@ -1276,7 +1288,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) } bd_set_size(bdev, (loff_t)bdev->bd_part->nr_sects << 9); if (!blkdev_dax_capable(bdev)) - bdev->bd_inode->i_flags &= ~S_DAX; + bd_set_dax(bdev, 0); } } else { if (bdev->bd_contains == bdev) {