From 7fb34b56e45a7b0b6eaeeef924158d3f281000a7 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 31 Jul 2017 15:08:12 -0500 Subject: [PATCH] Revert "xfs: grab dquots without taking the ilock" Source kernel commit: 0891f9971a3b00d243d5743cc78a628ad060adea This reverts commit cfcce6478cee639b15cd50e68cf66f884e137312. The new XFS_QMOPT_NOLOCK isn't used at all, and conditional locking based on a flag is always the wrong thing to do - we should be having helpers that can be called without the lock instead. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- libxfs/xfs_quota_defs.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libxfs/xfs_quota_defs.h b/libxfs/xfs_quota_defs.h index 2834574cb..d69c77227 100644 --- a/libxfs/xfs_quota_defs.h +++ b/libxfs/xfs_quota_defs.h @@ -136,8 +136,6 @@ typedef uint16_t xfs_qwarncnt_t; */ #define XFS_QMOPT_INHERIT 0x1000000 -#define XFS_QMOPT_NOLOCK 0x2000000 /* don't ilock during dqget */ - /* * flags to xfs_trans_mod_dquot. */ -- 2.47.2