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>

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index f461760c5b7618047e62c19353145846e086a375..5a5a54ad36850e623b4b5f36a8c0ef4682140383 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/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/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index 7fc2c8d4c802e47c9ca819a8336de68ea4474d03..916eb7db14d9a09ff541882bf12905d9fd5068ea 100644 (file)
--- 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)
 /*
  * 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
 
 /*