diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-12-18 15:00:10 -0500 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2012-01-17 16:07:54 -0500 |
commit | f392e6319a4e9a028b0c8b48f000bb01d660ad53 (patch) | |
tree | 6cf97bebb841da303056b60da087e76cc087af9b /fs/xfs/xfs_inode.h | |
parent | 474fce067521a40dbacc722e8ba119e81c2d31bf (diff) |
xfs: replace i_pin_wait with a bit waitqueue
Replace i_pin_wait, which is only used during synchronous inode flushing
with a bit waitqueue. This trades off a much smaller inode against
slightly slower wakeup performance, and saves 12 (32-bit) or 20 (64-bit)
bytes in the XFS inode.
Reviewed-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_inode.h')
-rw-r--r-- | fs/xfs/xfs_inode.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 960d2a89b3ac..4acbe740be46 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h | |||
@@ -238,7 +238,6 @@ typedef struct xfs_inode { | |||
238 | mrlock_t i_lock; /* inode lock */ | 238 | mrlock_t i_lock; /* inode lock */ |
239 | mrlock_t i_iolock; /* inode IO lock */ | 239 | mrlock_t i_iolock; /* inode IO lock */ |
240 | atomic_t i_pincount; /* inode pin count */ | 240 | atomic_t i_pincount; /* inode pin count */ |
241 | wait_queue_head_t i_ipin_wait; /* inode pinning wait queue */ | ||
242 | spinlock_t i_flags_lock; /* inode i_flags lock */ | 241 | spinlock_t i_flags_lock; /* inode i_flags lock */ |
243 | /* Miscellaneous state. */ | 242 | /* Miscellaneous state. */ |
244 | unsigned long i_flags; /* see defined flags below */ | 243 | unsigned long i_flags; /* see defined flags below */ |
@@ -367,6 +366,8 @@ xfs_set_projid(struct xfs_inode *ip, | |||
367 | #define XFS_IDIRTY_RELEASE (1 << 6) /* dirty release already seen */ | 366 | #define XFS_IDIRTY_RELEASE (1 << 6) /* dirty release already seen */ |
368 | #define __XFS_IFLOCK_BIT 7 /* inode is being flushed right now */ | 367 | #define __XFS_IFLOCK_BIT 7 /* inode is being flushed right now */ |
369 | #define XFS_IFLOCK (1 << __XFS_IFLOCK_BIT) | 368 | #define XFS_IFLOCK (1 << __XFS_IFLOCK_BIT) |
369 | #define __XFS_IPINNED_BIT 8 /* wakeup key for zero pin count */ | ||
370 | #define XFS_IPINNED (1 << __XFS_IPINNED_BIT) | ||
370 | 371 | ||
371 | /* | 372 | /* |
372 | * Per-lifetime flags need to be reset when re-using a reclaimable inode during | 373 | * Per-lifetime flags need to be reset when re-using a reclaimable inode during |