From 5f8aca8b43f41c4b2d4dc5389124a40cab92b644 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 12 Oct 2013 00:55:06 -0700 Subject: xfs: always hold the iolock when calling xfs_change_file_space Currently fallocate always holds the iolock when calling into xfs_change_file_space, while the ioctl path lets some of the lower level functions take it, but leave it out in others. This patch makes sure the ioctl path also always holds the iolock and thus introduces consistent locking for the preallocation operations while simplifying the code and allowing to kill the now unused XFS_ATTR_NOLOCK flag. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Ben Myers --- fs/xfs/xfs_iops.h | 1 - 1 file changed, 1 deletion(-) (limited to 'fs/xfs/xfs_iops.h') diff --git a/fs/xfs/xfs_iops.h b/fs/xfs/xfs_iops.h index fe4013af2586..f3738253c69a 100644 --- a/fs/xfs/xfs_iops.h +++ b/fs/xfs/xfs_iops.h @@ -31,7 +31,6 @@ extern void xfs_setup_inode(struct xfs_inode *); * Internal setattr interfaces. */ #define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */ -#define XFS_ATTR_NOLOCK 0x04 /* Don't grab any conflicting locks */ #define XFS_ATTR_NOACL 0x08 /* Don't call xfs_acl_chmod */ #define XFS_ATTR_SYNC 0x10 /* synchronous operation required */ -- cgit v1.2.1