From patchwork Fri Oct 16 02:10:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11840473 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FC7E61C for ; Fri, 16 Oct 2020 02:10:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A12820E65 for ; Fri, 16 Oct 2020 02:10:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IxQQOEHR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393355AbgJPCKO (ORCPT ); Thu, 15 Oct 2020 22:10:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41364 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393337AbgJPCKO (ORCPT ); Thu, 15 Oct 2020 22:10:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602814212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4GKH7rh2k/rQh/hmpoFMT51hnFYcNyy2ZeD2szUoX4I=; b=IxQQOEHRCpttf1DtjArUQgkyEXG6zDlGDcJB6piPtGn8dBRq9ZaujY8+uTgKdoySI8eqcQ sS2ajf6/xrvlER1/kyxNcZpz9TbYDE3uDAKoNEtbS+bNn09oDWbYjmtlS8Tuq3jIXiQExM j0h2hmVgzZzyZbqSE+QRMJgSLm7NNj4= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-fhnF4LnHOr2o7X-CdClfOQ-1; Thu, 15 Oct 2020 22:10:10 -0400 X-MC-Unique: fhnF4LnHOr2o7X-CdClfOQ-1 Received: by mail-wr1-f71.google.com with SMTP id q15so612809wrw.8 for ; Thu, 15 Oct 2020 19:10:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4GKH7rh2k/rQh/hmpoFMT51hnFYcNyy2ZeD2szUoX4I=; b=sQEGFrkQZnu73MQgnjBZHtiRDh/7OTPmVyq1rB7eY+Ph/A5NaEdynUQIYWoA6NalFs N3H5udwZzkLMZjMB1Q3iFhptMPR6nAtDI2b/VxxKyORCylzpiNIsoYfPbWLFI4lpbt6n uiKDNy5j0WsEjL+SuCKeKoFtKUU/NfPpCb3Wt+6PJB3W4dHEFgJRsCXnnIPY6Iy6jEp5 SNh2CRIf/xk45vsF5TfYHD7PzTLfv3lf5lE8Ls5XWkX7VC3k0nGHD8NHj0cUy5khA49D cIX41Q7FjfZ/Wk7gksIhB6AWny21oXBOFJ2oKJaTJzGQgBlw8UfEQbpxxTBFdSHsrEJK jDog== X-Gm-Message-State: AOAM532m6S4gX70Mq8VcXLCZBnGm5GEHTGXFKptuYbwHhVYD4zu+zXz4 adD3R376jzunHyaUYqRYdN6NnFLlppKkF0Hj4wE+4/08UoeWZ44JH2MQK76Okbh+NmnvytTOR70 1OLiHWBf80eZkVN5pb3uC X-Received: by 2002:a7b:c255:: with SMTP id b21mr1381735wmj.25.1602814208677; Thu, 15 Oct 2020 19:10:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhncWo2gLO81Y6v+U+ajCvE2V+WEw2RJiFj5r48Xtx/IJqXG7kYH7K7AZR5AxdDFZEpbSgaw== X-Received: by 2002:a7b:c255:: with SMTP id b21mr1381726wmj.25.1602814208429; Thu, 15 Oct 2020 19:10:08 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id v3sm1420685wre.17.2020.10.15.19.10.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 19:10:07 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v12 1/4] xfs: Refactor xfs_isilocked() Date: Fri, 16 Oct 2020 04:10:02 +0200 Message-Id: <20201016021005.548850-2-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201016021005.548850-1-preichl@redhat.com> References: <20201016021005.548850-1-preichl@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Refactor xfs_isilocked() to use newly introduced __xfs_rwsem_islocked(). __xfs_rwsem_islocked() is a helper function which encapsulates checking state of rw_semaphores hold by inode. Signed-off-by: Pavel Reichl Suggested-by: Dave Chinner Suggested-by: Eric Sandeen Suggested-by: Darrick J. Wong Reviewed-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Reviewed-by: Brian Foster --- fs/xfs/xfs_inode.c | 39 +++++++++++++++++++++++++++++++-------- fs/xfs/xfs_inode.h | 21 ++++++++++++++------- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index c06129cffba9..1fdf8c7eb990 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -345,9 +345,34 @@ xfs_ilock_demote( } #if defined(DEBUG) || defined(XFS_WARN) -int +static inline bool +__xfs_rwsem_islocked( + struct rw_semaphore *rwsem, + int lock_flags, + int shift) +{ + lock_flags >>= shift; + + if (!debug_locks) + return rwsem_is_locked(rwsem); + /* + * If the shared flag is not set, pass 0 to explicitly check for + * exclusive access to the lock. If the shared flag is set, we typically + * want to make sure the lock is at least held in shared mode + * (i.e., shared | excl) but we don't necessarily care that it might + * actually be held exclusive. Therefore, pass -1 to check whether the + * lock is held in any mode rather than one of the explicit shared mode + * values (1 or 2)." + */ + if (lock_flags & (1 << XFS_SHARED_LOCK_SHIFT)) { + return lockdep_is_held_type(rwsem, -1); + } + return lockdep_is_held_type(rwsem, 0); +} + +bool xfs_isilocked( - xfs_inode_t *ip, + struct xfs_inode *ip, uint lock_flags) { if (lock_flags & (XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)) { @@ -362,15 +387,13 @@ xfs_isilocked( return rwsem_is_locked(&ip->i_mmaplock.mr_lock); } - if (lock_flags & (XFS_IOLOCK_EXCL|XFS_IOLOCK_SHARED)) { - if (!(lock_flags & XFS_IOLOCK_SHARED)) - return !debug_locks || - lockdep_is_held_type(&VFS_I(ip)->i_rwsem, 0); - return rwsem_is_locked(&VFS_I(ip)->i_rwsem); + if (lock_flags & (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED)) { + return __xfs_rwsem_islocked(&VFS_I(ip)->i_rwsem, lock_flags, + XFS_IOLOCK_FLAG_SHIFT); } ASSERT(0); - return 0; + return false; } #endif diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index e9a8bb184d1f..9cecd6c9c90c 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -268,12 +268,19 @@ static inline void xfs_ifunlock(struct xfs_inode *ip) * Bit ranges: 1<<1 - 1<<16-1 -- iolock/ilock modes (bitfield) * 1<<16 - 1<<32-1 -- lockdep annotation (integers) */ -#define XFS_IOLOCK_EXCL (1<<0) -#define XFS_IOLOCK_SHARED (1<<1) -#define XFS_ILOCK_EXCL (1<<2) -#define XFS_ILOCK_SHARED (1<<3) -#define XFS_MMAPLOCK_EXCL (1<<4) -#define XFS_MMAPLOCK_SHARED (1<<5) + +#define XFS_IOLOCK_FLAG_SHIFT 0 +#define XFS_ILOCK_FLAG_SHIFT 2 +#define XFS_MMAPLOCK_FLAG_SHIFT 4 + +#define XFS_SHARED_LOCK_SHIFT 1 + +#define XFS_IOLOCK_EXCL (1 << XFS_IOLOCK_FLAG_SHIFT) +#define XFS_IOLOCK_SHARED (XFS_IOLOCK_EXCL << XFS_SHARED_LOCK_SHIFT) +#define XFS_ILOCK_EXCL (1 << XFS_ILOCK_FLAG_SHIFT) +#define XFS_ILOCK_SHARED (XFS_ILOCK_EXCL << XFS_SHARED_LOCK_SHIFT) +#define XFS_MMAPLOCK_EXCL (1 << XFS_MMAPLOCK_FLAG_SHIFT) +#define XFS_MMAPLOCK_SHARED (XFS_MMAPLOCK_EXCL << XFS_SHARED_LOCK_SHIFT) #define XFS_LOCK_MASK (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED \ | XFS_ILOCK_EXCL | XFS_ILOCK_SHARED \ @@ -412,7 +419,7 @@ void xfs_ilock(xfs_inode_t *, uint); int xfs_ilock_nowait(xfs_inode_t *, uint); void xfs_iunlock(xfs_inode_t *, uint); void xfs_ilock_demote(xfs_inode_t *, uint); -int xfs_isilocked(xfs_inode_t *, uint); +bool xfs_isilocked(struct xfs_inode *, uint); uint xfs_ilock_data_map_shared(struct xfs_inode *); uint xfs_ilock_attr_map_shared(struct xfs_inode *); From patchwork Fri Oct 16 02:10:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11840475 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AEDC117D1 for ; Fri, 16 Oct 2020 02:10:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E8E5208C7 for ; Fri, 16 Oct 2020 02:10:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="f5iKauky" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393357AbgJPCKO (ORCPT ); Thu, 15 Oct 2020 22:10:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46656 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393350AbgJPCKO (ORCPT ); Thu, 15 Oct 2020 22:10:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602814213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qpy0VrxMWvkww01mbI8Z5eZUiI2zU20d6Xjwcz513Pw=; b=f5iKauky5u0KZCj8bDIeNHsPmDVW4Ua0nU+uA8InCwe/Evql6lye7BHNhiH3eNEeL/5Tbe qRS4zaTCDfIGEn9uNROZp96RupQqR+48SjVr6FB2iM2eC0iPAuj4rqua+PfQ4YrZL/AnN7 db4ffH5Uis6vM4AIB6O/hvLtENZr2WA= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-316-gl6hD_njOaKPUrHn5fA6-A-1; Thu, 15 Oct 2020 22:10:11 -0400 X-MC-Unique: gl6hD_njOaKPUrHn5fA6-A-1 Received: by mail-wr1-f70.google.com with SMTP id b11so627553wrm.3 for ; Thu, 15 Oct 2020 19:10:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qpy0VrxMWvkww01mbI8Z5eZUiI2zU20d6Xjwcz513Pw=; b=qC0RQbBV3h+5w4Fefo18WxuotqWCRW3WoFlx5GLo2jIHM+yEgBNVLUNd2XQhdwztvt k7Nh0wb3Uf6le7JSRHZZZgVHcCDytVFEvuFDlXRFABPP4r/3nd2DosTOti/yOKyQSjgp 7BkEF1Gqf07ZDp4oTQDcgUQjXS1TAgi+BJWuKhAop0Un/OxykJRZ8cI5MOaD8mmmc/sX rhodl8llPMMeK9RiTvhRk6vju/8XpGIf4KC7UVZHnQvHxLQKMDzeW1uprSz8gWgwDQFS /xAyo94eE5tiPc3uLkXRLfBqWxrMtBINeG2iYCuu48xc2d5/pJckijMA4pUf6xo4o26N 2hMg== X-Gm-Message-State: AOAM530YN0Ql0/AgR9l9zwtfNm+fg2mD2DE0odNRvd0xHmYIp3CiMLoG y4eizVcH3wZMwHBNymCuPaLDk9iarWB4JOPOeRlGgiCyZbDThN58N+ETiTKlw6BhVEgVOZpkGXm yWn//8yt6a7gnDk7T2eR6 X-Received: by 2002:a1c:4856:: with SMTP id v83mr1382516wma.118.1602814209404; Thu, 15 Oct 2020 19:10:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9VSKkfccbfDrQlhJ9eMz3ngkjGTB+pYGYpo9+3r6iSmMmgV4x9NV8iXOX5MdM+994xYdCKw== X-Received: by 2002:a1c:4856:: with SMTP id v83mr1382507wma.118.1602814209233; Thu, 15 Oct 2020 19:10:09 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id v3sm1420685wre.17.2020.10.15.19.10.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 19:10:08 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v12 2/4] xfs: clean up whitespace in xfs_isilocked() calls Date: Fri, 16 Oct 2020 04:10:03 +0200 Message-Id: <20201016021005.548850-3-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201016021005.548850-1-preichl@redhat.com> References: <20201016021005.548850-1-preichl@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Make whitespace follow the same pattern in all xfs_isilocked() calls. Signed-off-by: Pavel Reichl Reviewed-by: Darrick J. Wong Reviewed-by: Brian Foster Reviewed-by: Christoph Hellwig --- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/xfs_file.c | 3 ++- fs/xfs/xfs_inode.c | 4 ++-- fs/xfs/xfs_qm.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 1b0a01b06a05..ced3b996cd8a 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -3883,7 +3883,7 @@ xfs_bmapi_read( ASSERT(*nmap >= 1); ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK | XFS_BMAPI_ENTIRE))); - ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED|XFS_ILOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); if (WARN_ON_ONCE(!ifp)) return -EFSCORRUPTED; diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index a29f78a663ca..c8b1d4e4199a 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -763,7 +763,8 @@ xfs_break_layouts( bool retry; int error; - ASSERT(xfs_isilocked(XFS_I(inode), XFS_IOLOCK_SHARED|XFS_IOLOCK_EXCL)); + ASSERT(xfs_isilocked(XFS_I(inode), + XFS_IOLOCK_SHARED | XFS_IOLOCK_EXCL)); do { retry = false; diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 1fdf8c7eb990..085927700530 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2772,7 +2772,7 @@ static void xfs_iunpin( struct xfs_inode *ip) { - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)); trace_xfs_inode_unpin_nowait(ip, _RET_IP_); @@ -3465,7 +3465,7 @@ xfs_iflush( struct xfs_mount *mp = ip->i_mount; int error; - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)); ASSERT(xfs_isiflocked(ip)); ASSERT(ip->i_df.if_format != XFS_DINODE_FMT_BTREE || ip->i_df.if_nextents > XFS_IFORK_MAXEXT(ip, XFS_DATA_FORK)); diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index be67570badf8..57bfa5266c47 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -1803,7 +1803,7 @@ xfs_qm_vop_chown_reserve( int error; - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)); ASSERT(XFS_IS_QUOTA_RUNNING(mp)); delblks = ip->i_delayed_blks; From patchwork Fri Oct 16 02:10:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11840477 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C46161C for ; Fri, 16 Oct 2020 02:10:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 580912087D for ; Fri, 16 Oct 2020 02:10:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LGC1KzVf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393361AbgJPCKP (ORCPT ); Thu, 15 Oct 2020 22:10:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52735 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393353AbgJPCKP (ORCPT ); Thu, 15 Oct 2020 22:10:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602814213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MfskKedjbuMhMr9I37Yepp3TV5To7FBSMj5kfmhNapA=; b=LGC1KzVfFWBrWheTyV98epGU2Rdu+1Ovn3peO9YEw41XY312dQsIrjBl7hBrnGH8HXrSff ArATjnEC3A2a2Ygb9y500WDKyT/YNeNRxVYw/dR9XymyzNTWXefale9N5gfmz0kfhSh7JE 1Yhej14LnJTaxz0AS+XZ3XdIt8tzGTg= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-409-Nt1vXe5-MQm0W3gN8fOI_Q-1; Thu, 15 Oct 2020 22:10:11 -0400 X-MC-Unique: Nt1vXe5-MQm0W3gN8fOI_Q-1 Received: by mail-wr1-f70.google.com with SMTP id q15so612838wrw.8 for ; Thu, 15 Oct 2020 19:10:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MfskKedjbuMhMr9I37Yepp3TV5To7FBSMj5kfmhNapA=; b=EFSJPK7wIGyslrwpH2zzQqJJpI1OLawQkgxxj1UQH4H3VRrCCOR8in4sIVoooJxGu8 3TyjXf1NcXaKEzyVtPKdjG+pjJbPmYBhdu23Faf8J3AiHyxId2MnETFhAqNEbvbQi3tm JSUmaiqNBq03Ee1yCwkIWaTPFUVkMoisFp3JXhB0b30dxFX8LmcwoIAMCXpyOKBrlAaO iRiSG6yGnYlUmJ1d7HoKRps9C2a4R409+bShaUqm8IiQG9CfwQt9ylKJTKFYEvz5Of9u gdrrd6Dt6q2ltvQVX9paquM4niIdKELJA+THfyxDV4hbOuffr0SPsbE7d4MmeElfTKUK IP/w== X-Gm-Message-State: AOAM532fwd+y21GkgPAZenjiCobTK4QQsc84ijQGGghe1q6fSEupQHqb 4Hg+kLXcnDiXTm9SPVjDoI+rmRLfM0vqWpOZdSG4VqTL5uWc/JLg0nidVbLlxqYRxoZwglrvLTe i0PGN1sw6ttIU44t5iko5 X-Received: by 2002:adf:94e6:: with SMTP id 93mr1057922wrr.190.1602814210144; Thu, 15 Oct 2020 19:10:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAbmCxUOPWMjJRYyloMdSWqCKAN13MDzhkTdoAS0MzNWWhLTWPOn/kxbbV8O88NYpR5EobaA== X-Received: by 2002:adf:94e6:: with SMTP id 93mr1057911wrr.190.1602814209999; Thu, 15 Oct 2020 19:10:09 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id v3sm1420685wre.17.2020.10.15.19.10.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 19:10:09 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v12 3/4] xfs: xfs_isilocked() can only check a single lock type Date: Fri, 16 Oct 2020 04:10:04 +0200 Message-Id: <20201016021005.548850-4-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201016021005.548850-1-preichl@redhat.com> References: <20201016021005.548850-1-preichl@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org In its current form, xfs_isilocked() is only able to test one lock type at a time - ilock, iolock, or mmap lock, but combinations are not properly handled. The intent here is to check that both XFS_IOLOCK_EXCL and XFS_ILOCK_EXCL are held, so test them each separately. The commit ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents") ORed the flags together which was an error, so this patch reverts that part of the change and check the locks independently. Fixes: ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents") Suggested-by: Dave Chinner Signed-off-by: Pavel Reichl Reviewed-by: Darrick J. Wong Reviewed-by: Brian Foster Reviewed-by: Christoph Hellwig --- fs/xfs/libxfs/xfs_bmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index ced3b996cd8a..ff5cc8a5d476 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5787,7 +5787,8 @@ xfs_bmap_collapse_extents( if (XFS_FORCED_SHUTDOWN(mp)) return -EIO; - ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); if (!(ifp->if_flags & XFS_IFEXTENTS)) { error = xfs_iread_extents(tp, ip, whichfork); @@ -5904,7 +5905,8 @@ xfs_bmap_insert_extents( if (XFS_FORCED_SHUTDOWN(mp)) return -EIO; - ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); if (!(ifp->if_flags & XFS_IFEXTENTS)) { error = xfs_iread_extents(tp, ip, whichfork); From patchwork Fri Oct 16 02:10:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Reichl X-Patchwork-Id: 11840479 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FFD761C for ; Fri, 16 Oct 2020 02:10:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4C63920897 for ; Fri, 16 Oct 2020 02:10:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Yue9XRne" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393387AbgJPCKX (ORCPT ); Thu, 15 Oct 2020 22:10:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29028 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393379AbgJPCKX (ORCPT ); Thu, 15 Oct 2020 22:10:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602814220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HbJrU8J3wxNI/dXi+6MkhN2CIyrhigjNuq3VoDFiDTA=; b=Yue9XRnexQ2QBqOcYLGiFm/Ck+rRqOTD8yRbpbfw8HQe546ZHQ1JWWikgAbK/r5O4HzOx7 3Gqnwc59mxtpt/hDsysauwFwhpwZZzoSzZk82uXXrwhJpdgZj/+SllVX5S4HcQCcYhOEkp rWFZLLWWJLrizm5YGAkf5Ucctku44f0= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-122-SPFCNBq5M4SwC2w_jDySUw-1; Thu, 15 Oct 2020 22:10:12 -0400 X-MC-Unique: SPFCNBq5M4SwC2w_jDySUw-1 Received: by mail-wm1-f71.google.com with SMTP id u5so167930wme.3 for ; Thu, 15 Oct 2020 19:10:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HbJrU8J3wxNI/dXi+6MkhN2CIyrhigjNuq3VoDFiDTA=; b=oEhtOlqwuv6XyuT2aWKOg8tkLOeNrPgiMiZD3hvxa2KcHMsw2iULEYuesQZ50BJdTE 3OitPMdQuIrIP146NvQRIs28SEfmsRnRwcnx8gILJ5I5ZV1rp8s7cNh8151oGfRb6fE1 DUpyLR55jeRKMwbEHefR2KU0NdDDeYJ2cmePm6HEzc/8da7MX7caTA5RPcaQ4eUCXWq0 99X8MjfLrhjr1sft1G1buIIbrgs1PrVdFMAZWH9x7nIcPQoRsmOQU8qbLMqEQTdMtVgA IsXGJ/Wy9/KokMIUjEv3MvE2XmE05+TAfZmAruZshD4jwnOCCI9KFM632LtpGRT6q/2Z Lx3A== X-Gm-Message-State: AOAM531NoABrejfwNUk19xgGhSu7h539bdg9hEuRjw4og0K4AIBFrwRo c6VfWTIiO/3Ae97E862LfgKpIvDa9Doqi/f5K/GvSPLjz/Itb99loLllKYZYS2xM5yzjV67rSTS srKkuvLZux+apJ2IStRVV X-Received: by 2002:a7b:cc09:: with SMTP id f9mr1285756wmh.93.1602814211024; Thu, 15 Oct 2020 19:10:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQYVWFwh59BkuhxNaWJzKi2oX0z3WgNMdOMsPpweQcNsihLQZK+ZaouJKk75+2C+IF/JCItg== X-Received: by 2002:a7b:cc09:: with SMTP id f9mr1285741wmh.93.1602814210755; Thu, 15 Oct 2020 19:10:10 -0700 (PDT) Received: from localhost.localdomain.com ([84.19.91.81]) by smtp.gmail.com with ESMTPSA id v3sm1420685wre.17.2020.10.15.19.10.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 19:10:10 -0700 (PDT) From: Pavel Reichl To: linux-xfs@vger.kernel.org Subject: [PATCH v12 4/4] xfs: replace mrlock_t with rw_semaphores Date: Fri, 16 Oct 2020 04:10:05 +0200 Message-Id: <20201016021005.548850-5-preichl@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201016021005.548850-1-preichl@redhat.com> References: <20201016021005.548850-1-preichl@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Remove mrlock_t as it does not provide any extra value over rw_semaphores. Make i_lock and i_mmaplock native rw_semaphores and replace mr*() functions with native rwsem calls. Release the lock in xfs_btree_split() just before the work-queue executing xfs_btree_split_worker() is scheduled and make xfs_btree_split_worker() to acquire the lock as a first thing and release it just before returning from the function. This it done so the ownership of the lock is transfered between kernel threads and thus lockdep won't complain about lock being held by a different kernel thread. Signed-off-by: Pavel Reichl Reviewed-by: Christoph Hellwig Reviewed-by: Brian Foster Reviewed-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_btree.c | 25 +++++++++++++ fs/xfs/mrlock.h | 78 --------------------------------------- fs/xfs/xfs_inode.c | 52 ++++++++++++++------------ fs/xfs/xfs_inode.h | 4 +- fs/xfs/xfs_iops.c | 4 +- fs/xfs/xfs_linux.h | 2 +- fs/xfs/xfs_super.c | 6 +-- 7 files changed, 60 insertions(+), 111 deletions(-) delete mode 100644 fs/xfs/mrlock.h diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c index 2d25bab68764..5ec2098c271c 100644 --- a/fs/xfs/libxfs/xfs_btree.c +++ b/fs/xfs/libxfs/xfs_btree.c @@ -2816,6 +2816,12 @@ xfs_btree_split_worker( unsigned long pflags; unsigned long new_pflags = PF_MEMALLOC_NOFS; + /* + * Update lockdep's lock ownership information to point to + * this thread as the thread that scheduled this worker is waiting + * for its completion. + */ + rwsem_acquire(&args->cur->bc_ino.ip->i_lock.dep_map, 0, 0, _RET_IP_); /* * we are in a transaction context here, but may also be doing work * in kswapd context, and hence we may need to inherit that state @@ -2829,6 +2835,12 @@ xfs_btree_split_worker( args->result = __xfs_btree_split(args->cur, args->level, args->ptrp, args->key, args->curp, args->stat); + /* + * Update lockdep's lock ownership information to reflect that we will + * be transferring the ilock from this worker back to the scheduling + * thread. + */ + rwsem_release(&args->cur->bc_ino.ip->i_lock.dep_map, _THIS_IP_); complete(args->done); current_restore_flags_nested(&pflags, new_pflags); @@ -2863,8 +2875,21 @@ xfs_btree_split( args.done = &done; args.kswapd = current_is_kswapd(); INIT_WORK_ONSTACK(&args.work, xfs_btree_split_worker); + /* + * Update lockdep's ownership information to reflect transfer of the + * ilock from the current task to the worker. Otherwise assertions that + * the lock is held (such as when logging the inode) might fail due to + * incorrect task owner state. + */ + rwsem_release(&cur->bc_ino.ip->i_lock.dep_map, _THIS_IP_); queue_work(xfs_alloc_wq, &args.work); wait_for_completion(&done); + /* + * Update lockdep's lock ownership information to point to + * this thread as the lock owner now that the worker item is + * done. + */ + rwsem_acquire(&cur->bc_ino.ip->i_lock.dep_map, 0, 0, _RET_IP_); destroy_work_on_stack(&args.work); return args.result; } diff --git a/fs/xfs/mrlock.h b/fs/xfs/mrlock.h deleted file mode 100644 index 79155eec341b..000000000000 --- a/fs/xfs/mrlock.h +++ /dev/null @@ -1,78 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2000-2006 Silicon Graphics, Inc. - * All Rights Reserved. - */ -#ifndef __XFS_SUPPORT_MRLOCK_H__ -#define __XFS_SUPPORT_MRLOCK_H__ - -#include - -typedef struct { - struct rw_semaphore mr_lock; -#if defined(DEBUG) || defined(XFS_WARN) - int mr_writer; -#endif -} mrlock_t; - -#if defined(DEBUG) || defined(XFS_WARN) -#define mrinit(mrp, name) \ - do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0) -#else -#define mrinit(mrp, name) \ - do { init_rwsem(&(mrp)->mr_lock); } while (0) -#endif - -#define mrlock_init(mrp, t,n,s) mrinit(mrp, n) -#define mrfree(mrp) do { } while (0) - -static inline void mraccess_nested(mrlock_t *mrp, int subclass) -{ - down_read_nested(&mrp->mr_lock, subclass); -} - -static inline void mrupdate_nested(mrlock_t *mrp, int subclass) -{ - down_write_nested(&mrp->mr_lock, subclass); -#if defined(DEBUG) || defined(XFS_WARN) - mrp->mr_writer = 1; -#endif -} - -static inline int mrtryaccess(mrlock_t *mrp) -{ - return down_read_trylock(&mrp->mr_lock); -} - -static inline int mrtryupdate(mrlock_t *mrp) -{ - if (!down_write_trylock(&mrp->mr_lock)) - return 0; -#if defined(DEBUG) || defined(XFS_WARN) - mrp->mr_writer = 1; -#endif - return 1; -} - -static inline void mrunlock_excl(mrlock_t *mrp) -{ -#if defined(DEBUG) || defined(XFS_WARN) - mrp->mr_writer = 0; -#endif - up_write(&mrp->mr_lock); -} - -static inline void mrunlock_shared(mrlock_t *mrp) -{ - up_read(&mrp->mr_lock); -} - -static inline void mrdemote(mrlock_t *mrp) -{ -#if defined(DEBUG) || defined(XFS_WARN) - mrp->mr_writer = 0; -#endif - downgrade_write(&mrp->mr_lock); -} - -#endif /* __XFS_SUPPORT_MRLOCK_H__ */ diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 085927700530..f47202c487e0 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -191,14 +191,15 @@ xfs_ilock( } if (lock_flags & XFS_MMAPLOCK_EXCL) - mrupdate_nested(&ip->i_mmaplock, XFS_MMAPLOCK_DEP(lock_flags)); + down_write_nested(&ip->i_mmaplock, + XFS_MMAPLOCK_DEP(lock_flags)); else if (lock_flags & XFS_MMAPLOCK_SHARED) - mraccess_nested(&ip->i_mmaplock, XFS_MMAPLOCK_DEP(lock_flags)); + down_read_nested(&ip->i_mmaplock, XFS_MMAPLOCK_DEP(lock_flags)); if (lock_flags & XFS_ILOCK_EXCL) - mrupdate_nested(&ip->i_lock, XFS_ILOCK_DEP(lock_flags)); + down_write_nested(&ip->i_lock, XFS_ILOCK_DEP(lock_flags)); else if (lock_flags & XFS_ILOCK_SHARED) - mraccess_nested(&ip->i_lock, XFS_ILOCK_DEP(lock_flags)); + down_read_nested(&ip->i_lock, XFS_ILOCK_DEP(lock_flags)); } /* @@ -242,27 +243,27 @@ xfs_ilock_nowait( } if (lock_flags & XFS_MMAPLOCK_EXCL) { - if (!mrtryupdate(&ip->i_mmaplock)) + if (!down_write_trylock(&ip->i_mmaplock)) goto out_undo_iolock; } else if (lock_flags & XFS_MMAPLOCK_SHARED) { - if (!mrtryaccess(&ip->i_mmaplock)) + if (!down_read_trylock(&ip->i_mmaplock)) goto out_undo_iolock; } if (lock_flags & XFS_ILOCK_EXCL) { - if (!mrtryupdate(&ip->i_lock)) + if (!down_write_trylock(&ip->i_lock)) goto out_undo_mmaplock; } else if (lock_flags & XFS_ILOCK_SHARED) { - if (!mrtryaccess(&ip->i_lock)) + if (!down_read_trylock(&ip->i_lock)) goto out_undo_mmaplock; } return 1; out_undo_mmaplock: if (lock_flags & XFS_MMAPLOCK_EXCL) - mrunlock_excl(&ip->i_mmaplock); + up_write(&ip->i_mmaplock); else if (lock_flags & XFS_MMAPLOCK_SHARED) - mrunlock_shared(&ip->i_mmaplock); + up_read(&ip->i_mmaplock); out_undo_iolock: if (lock_flags & XFS_IOLOCK_EXCL) up_write(&VFS_I(ip)->i_rwsem); @@ -309,14 +310,14 @@ xfs_iunlock( up_read(&VFS_I(ip)->i_rwsem); if (lock_flags & XFS_MMAPLOCK_EXCL) - mrunlock_excl(&ip->i_mmaplock); + up_write(&ip->i_mmaplock); else if (lock_flags & XFS_MMAPLOCK_SHARED) - mrunlock_shared(&ip->i_mmaplock); + up_read(&ip->i_mmaplock); if (lock_flags & XFS_ILOCK_EXCL) - mrunlock_excl(&ip->i_lock); + up_write(&ip->i_lock); else if (lock_flags & XFS_ILOCK_SHARED) - mrunlock_shared(&ip->i_lock); + up_read(&ip->i_lock); trace_xfs_iunlock(ip, lock_flags, _RET_IP_); } @@ -335,9 +336,9 @@ xfs_ilock_demote( ~(XFS_IOLOCK_EXCL|XFS_MMAPLOCK_EXCL|XFS_ILOCK_EXCL)) == 0); if (lock_flags & XFS_ILOCK_EXCL) - mrdemote(&ip->i_lock); + downgrade_write(&ip->i_lock); if (lock_flags & XFS_MMAPLOCK_EXCL) - mrdemote(&ip->i_mmaplock); + downgrade_write(&ip->i_mmaplock); if (lock_flags & XFS_IOLOCK_EXCL) downgrade_write(&VFS_I(ip)->i_rwsem); @@ -375,19 +376,22 @@ xfs_isilocked( struct xfs_inode *ip, uint lock_flags) { - if (lock_flags & (XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)) { - if (!(lock_flags & XFS_ILOCK_SHARED)) - return !!ip->i_lock.mr_writer; - return rwsem_is_locked(&ip->i_lock.mr_lock); + if (lock_flags & (XFS_ILOCK_EXCL | XFS_ILOCK_SHARED)) { + ASSERT(!(lock_flags & ~(XFS_ILOCK_EXCL | XFS_ILOCK_SHARED))); + return __xfs_rwsem_islocked(&ip->i_lock, lock_flags, + XFS_ILOCK_FLAG_SHIFT); } - if (lock_flags & (XFS_MMAPLOCK_EXCL|XFS_MMAPLOCK_SHARED)) { - if (!(lock_flags & XFS_MMAPLOCK_SHARED)) - return !!ip->i_mmaplock.mr_writer; - return rwsem_is_locked(&ip->i_mmaplock.mr_lock); + if (lock_flags & (XFS_MMAPLOCK_EXCL | XFS_MMAPLOCK_SHARED)) { + ASSERT(!(lock_flags & + ~(XFS_MMAPLOCK_EXCL | XFS_MMAPLOCK_SHARED))); + return __xfs_rwsem_islocked(&ip->i_mmaplock, lock_flags, + XFS_MMAPLOCK_FLAG_SHIFT); } if (lock_flags & (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED)) { + ASSERT(!(lock_flags & + ~(XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED))); return __xfs_rwsem_islocked(&VFS_I(ip)->i_rwsem, lock_flags, XFS_IOLOCK_FLAG_SHIFT); } diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 9cecd6c9c90c..413998972b35 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -39,8 +39,8 @@ typedef struct xfs_inode { /* Transaction and locking information. */ struct xfs_inode_log_item *i_itemp; /* logging information */ - mrlock_t i_lock; /* inode lock */ - mrlock_t i_mmaplock; /* inode mmap IO lock */ + struct rw_semaphore i_lock; /* inode lock */ + struct rw_semaphore i_mmaplock; /* inode mmap IO lock */ atomic_t i_pincount; /* inode pin count */ /* diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 80a13c8561d8..66cca3e599c7 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1336,9 +1336,9 @@ xfs_setup_inode( */ lockdep_set_class(&inode->i_rwsem, &inode->i_sb->s_type->i_mutex_dir_key); - lockdep_set_class(&ip->i_lock.mr_lock, &xfs_dir_ilock_class); + lockdep_set_class(&ip->i_lock, &xfs_dir_ilock_class); } else { - lockdep_set_class(&ip->i_lock.mr_lock, &xfs_nondir_ilock_class); + lockdep_set_class(&ip->i_lock, &xfs_nondir_ilock_class); } /* diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index ab737fed7b12..ba37217f86d2 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -22,7 +22,6 @@ typedef __u32 xfs_nlink_t; #include "xfs_types.h" #include "kmem.h" -#include "mrlock.h" #include #include @@ -61,6 +60,7 @@ typedef __u32 xfs_nlink_t; #include #include #include +#include #include #include diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 71ac6c1cdc36..00be9cfa29fa 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -708,10 +708,8 @@ xfs_fs_inode_init_once( atomic_set(&ip->i_pincount, 0); spin_lock_init(&ip->i_flags_lock); - mrlock_init(&ip->i_mmaplock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, - "xfsino", ip->i_ino); - mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, - "xfsino", ip->i_ino); + init_rwsem(&ip->i_mmaplock); + init_rwsem(&ip->i_lock); } /*