diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-06-23 04:11:15 -0400 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-07-26 14:16:38 -0400 |
commit | 9134c2332ecb9154860669d778ef2808f06503ec (patch) | |
tree | 544fa9e5ffc843b10231573ef25c0b358f9fa6bb | |
parent | dbb2f6529feeee8f4de77849edeee2e60c40c805 (diff) |
xfs: remove the unused XFS_LOG_SLEEP and XFS_LOG_NOSLEEP flags
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
-rw-r--r-- | fs/xfs/xfs_log.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_log.h | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index f461760c5b76..5a5a54ad3685 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
@@ -333,7 +333,6 @@ xfs_log_reserve( | |||
333 | int retval = 0; | 333 | int retval = 0; |
334 | 334 | ||
335 | ASSERT(client == XFS_TRANSACTION || client == XFS_LOG); | 335 | ASSERT(client == XFS_TRANSACTION || client == XFS_LOG); |
336 | ASSERT((flags & XFS_LOG_NOSLEEP) == 0); | ||
337 | 336 | ||
338 | if (XLOG_FORCED_SHUTDOWN(log)) | 337 | if (XLOG_FORCED_SHUTDOWN(log)) |
339 | return XFS_ERROR(EIO); | 338 | return XFS_ERROR(EIO); |
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index 7fc2c8d4c802..916eb7db14d9 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h | |||
@@ -55,14 +55,10 @@ static inline xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2) | |||
55 | /* | 55 | /* |
56 | * Flags to xfs_log_reserve() | 56 | * Flags to xfs_log_reserve() |
57 | * | 57 | * |
58 | * XFS_LOG_SLEEP: If space is not available, sleep (default) | ||
59 | * XFS_LOG_NOSLEEP: If space is not available, return error | ||
60 | * XFS_LOG_PERM_RESERV: Permanent reservation. When writes are | 58 | * XFS_LOG_PERM_RESERV: Permanent reservation. When writes are |
61 | * performed against this type of reservation, the reservation | 59 | * performed against this type of reservation, the reservation |
62 | * is not decreased. Long running transactions should use this. | 60 | * is not decreased. Long running transactions should use this. |
63 | */ | 61 | */ |
64 | #define XFS_LOG_SLEEP 0x0 | ||
65 | #define XFS_LOG_NOSLEEP 0x1 | ||
66 | #define XFS_LOG_PERM_RESERV 0x2 | 62 | #define XFS_LOG_PERM_RESERV 0x2 |
67 | 63 | ||
68 | /* | 64 | /* |