diff options
| author | Christoph Hellwig <hch@infradead.org> | 2012-02-20 02:31:31 +0000 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-02-22 22:37:04 -0600 |
| commit | 9006fb91cfdf22812923f0536c7531c429c1aeab (patch) | |
| tree | 36b37fe3df405a57e8ede3d2a40ea6c307f40ae9 /fs/xfs/xfs_log.h | |
| parent | 42ceedb3caffe67c4ec0dfbb78ce410832d429b9 (diff) | |
| download | op-kernel-dev-9006fb91cfdf22812923f0536c7531c429c1aeab.zip op-kernel-dev-9006fb91cfdf22812923f0536c7531c429c1aeab.tar.gz | |
xfs: split and cleanup xfs_log_reserve
Split the log regrant case out of xfs_log_reserve into a separate function,
and merge xlog_grant_log_space and xlog_regrant_write_log_space into their
respective callers. Also replace the XFS_LOG_PERM_RESERV flag, which easily
got misused before the previous cleanups with a simple boolean parameter.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_log.h')
| -rw-r--r-- | fs/xfs/xfs_log.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index fe32c69..2c622be 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h @@ -53,15 +53,6 @@ static inline xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2) #define XFS_LOG_REL_PERM_RESERV 0x1 /* - * Flags to xfs_log_reserve() - * - * 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_PERM_RESERV 0x2 - -/* * Flags to xfs_log_force() * * XFS_LOG_SYNC: Synchronous force in-core log to disk @@ -172,8 +163,9 @@ int xfs_log_reserve(struct xfs_mount *mp, int count, struct xlog_ticket **ticket, __uint8_t clientid, - uint flags, + bool permanent, uint t_type); +int xfs_log_regrant(struct xfs_mount *mp, struct xlog_ticket *tic); int xfs_log_unmount_write(struct xfs_mount *mp); void xfs_log_unmount(struct xfs_mount *mp); int xfs_log_force_umount(struct xfs_mount *mp, int logerror); |
