From af6c42b26017277f5944e99728845a3d31e1bb08 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 23 Jun 2010 18:11:15 +1000 Subject: [PATCH] --- yaml --- r: 201740 b: refs/heads/master c: 9134c2332ecb9154860669d778ef2808f06503ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_log.c | 1 - trunk/fs/xfs/xfs_log.h | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 713641031cce..5ca1ea94b1b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbb2f6529feeee8f4de77849edeee2e60c40c805 +refs/heads/master: 9134c2332ecb9154860669d778ef2808f06503ec diff --git a/trunk/fs/xfs/xfs_log.c b/trunk/fs/xfs/xfs_log.c index f461760c5b76..5a5a54ad3685 100644 --- a/trunk/fs/xfs/xfs_log.c +++ b/trunk/fs/xfs/xfs_log.c @@ -333,7 +333,6 @@ xfs_log_reserve( int retval = 0; ASSERT(client == XFS_TRANSACTION || client == XFS_LOG); - ASSERT((flags & XFS_LOG_NOSLEEP) == 0); if (XLOG_FORCED_SHUTDOWN(log)) return XFS_ERROR(EIO); diff --git a/trunk/fs/xfs/xfs_log.h b/trunk/fs/xfs/xfs_log.h index 7fc2c8d4c802..916eb7db14d9 100644 --- a/trunk/fs/xfs/xfs_log.h +++ b/trunk/fs/xfs/xfs_log.h @@ -55,14 +55,10 @@ static inline xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2) /* * Flags to xfs_log_reserve() * - * XFS_LOG_SLEEP: If space is not available, sleep (default) - * XFS_LOG_NOSLEEP: If space is not available, return error * XFS_LOG_PERM_RESERV: Permanent reservation. When writes are * performed against this type of reservation, the reservation * is not decreased. Long running transactions should use this. */ -#define XFS_LOG_SLEEP 0x0 -#define XFS_LOG_NOSLEEP 0x1 #define XFS_LOG_PERM_RESERV 0x2 /*