The patch titled
xfs: remove unused locking flags
has been added to the -mm tree. Its filename is
xfs-remove-unused-locking-flags.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: xfs: remove unused locking flags
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Nathan Scott <nathans@xxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/xfs/linux-2.6/xfs_lrw.c | 10 +++++-----
fs/xfs/xfs_inode.h | 12 +-----------
fs/xfs/xfs_iomap.c | 4 ++--
3 files changed, 8 insertions(+), 18 deletions(-)
diff -puN fs/xfs/linux-2.6/xfs_lrw.c~xfs-remove-unused-locking-flags fs/xfs/linux-2.6/xfs_lrw.c
--- a/fs/xfs/linux-2.6/xfs_lrw.c~xfs-remove-unused-locking-flags
+++ a/fs/xfs/linux-2.6/xfs_lrw.c
@@ -473,13 +473,13 @@ xfs_zero_last_block(
* out sync. We need to drop the ilock while we do this so we
* don't deadlock when the buffer cache calls back to us.
*/
- XFS_IUNLOCK(mp, io, XFS_ILOCK_EXCL| XFS_EXTSIZE_RD);
+ XFS_IUNLOCK(mp, io, XFS_ILOCK_EXCL);
loff = XFS_FSB_TO_B(mp, last_fsb);
zero_len = mp->m_sb.sb_blocksize - zero_offset;
error = xfs_iozero(ip, loff + zero_offset, zero_len, end_size);
- XFS_ILOCK(mp, io, XFS_ILOCK_EXCL|XFS_EXTSIZE_RD);
+ XFS_ILOCK(mp, io, XFS_ILOCK_EXCL);
ASSERT(error >= 0);
return error;
}
@@ -580,7 +580,7 @@ xfs_zero_eof(
* Drop the inode lock while we're doing the I/O.
* We'll still have the iolock to protect us.
*/
- XFS_IUNLOCK(mp, io, XFS_ILOCK_EXCL|XFS_EXTSIZE_RD);
+ XFS_IUNLOCK(mp, io, XFS_ILOCK_EXCL);
error = xfs_iozero(ip,
XFS_FSB_TO_B(mp, start_zero_fsb),
@@ -593,14 +593,14 @@ xfs_zero_eof(
start_zero_fsb = imap.br_startoff + imap.br_blockcount;
ASSERT(start_zero_fsb <= (end_zero_fsb + 1));
- XFS_ILOCK(mp, io, XFS_ILOCK_EXCL|XFS_EXTSIZE_RD);
+ XFS_ILOCK(mp, io, XFS_ILOCK_EXCL);
}
return 0;
out_lock:
- XFS_ILOCK(mp, io, XFS_ILOCK_EXCL|XFS_EXTSIZE_RD);
+ XFS_ILOCK(mp, io, XFS_ILOCK_EXCL);
ASSERT(error >= 0);
return error;
}
diff -puN fs/xfs/xfs_inode.h~xfs-remove-unused-locking-flags fs/xfs/xfs_inode.h
--- a/fs/xfs/xfs_inode.h~xfs-remove-unused-locking-flags
+++ a/fs/xfs/xfs_inode.h
@@ -343,20 +343,10 @@ typedef struct xfs_inode {
#define XFS_ILOCK_EXCL 0x004
#define XFS_ILOCK_SHARED 0x008
#define XFS_IUNLOCK_NONOTIFY 0x010
-/* XFS_IOLOCK_NESTED 0x020 */
-#define XFS_EXTENT_TOKEN_RD 0x040
-#define XFS_SIZE_TOKEN_RD 0x080
-#define XFS_EXTSIZE_RD (XFS_EXTENT_TOKEN_RD|XFS_SIZE_TOKEN_RD)
-#define XFS_WILLLEND 0x100 /* Always acquire tokens for lending */
-#define XFS_EXTENT_TOKEN_WR (XFS_EXTENT_TOKEN_RD | XFS_WILLLEND)
-#define XFS_SIZE_TOKEN_WR (XFS_SIZE_TOKEN_RD | XFS_WILLLEND)
-#define XFS_EXTSIZE_WR (XFS_EXTSIZE_RD | XFS_WILLLEND)
-/* XFS_SIZE_TOKEN_WANT 0x200 */
#define XFS_LOCK_MASK \
(XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED | XFS_ILOCK_EXCL | \
- XFS_ILOCK_SHARED | XFS_EXTENT_TOKEN_RD | XFS_SIZE_TOKEN_RD | \
- XFS_WILLLEND)
+ XFS_ILOCK_SHARED)
/*
* Flags for xfs_iflush()
diff -puN fs/xfs/xfs_iomap.c~xfs-remove-unused-locking-flags fs/xfs/xfs_iomap.c
--- a/fs/xfs/xfs_iomap.c~xfs-remove-unused-locking-flags
+++ a/fs/xfs/xfs_iomap.c
@@ -211,14 +211,14 @@ xfs_iomap(
break;
case BMAPI_WRITE:
xfs_iomap_enter_trace(XFS_IOMAP_WRITE_ENTER, io, offset, count);
- lockmode = XFS_ILOCK_EXCL|XFS_EXTSIZE_WR;
+ lockmode = XFS_ILOCK_EXCL;
if (flags & BMAPI_IGNSTATE)
bmapi_flags |= XFS_BMAPI_IGSTATE|XFS_BMAPI_ENTIRE;
XFS_ILOCK(mp, io, lockmode);
break;
case BMAPI_ALLOCATE:
xfs_iomap_enter_trace(XFS_IOMAP_ALLOC_ENTER, io, offset, count);
- lockmode = XFS_ILOCK_SHARED|XFS_EXTSIZE_RD;
+ lockmode = XFS_ILOCK_SHARED;
bmapi_flags = XFS_BMAPI_ENTIRE;
/* Attempt non-blocking lock */
if (flags & BMAPI_TRYLOCK) {
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-xfs.patch
xfs-move-xfs_ioc_getversion-to-main-multiplexer.patch
xfs-remove-unused-locking-flags.patch
cris-switch-to-iminor-imajor.patch
pcf8563-remove-mod_inc_use_count-mod_dec_use_count.patch
aoe-cleanup-i_rdev-usage.patch
isdn-cleanup-i_rdev-udage.patch
documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch
ioctl-messtxt-xfs-typos.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
