diff options
author | Dave Chinner <david@fromorbit.com> | 2015-06-04 13:55:48 +1000 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-06-04 13:55:48 +1000 |
commit | 4ea79766168b64766d6c9fcdaa9fab83a6cfebcf (patch) | |
tree | 7b29eaf46119a920f277b5cd13c818e2d35beafa /fs/xfs/xfs_log.h | |
parent | 4497f28750cd129a669e32b7810dd755102aebbd (diff) | |
parent | f78c3901074e113a04150230087f1d76033bb0a4 (diff) | |
download | op-kernel-dev-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.zip op-kernel-dev-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.tar.gz |
Merge branch 'xfs-commit-cleanup' into for-next
Conflicts:
fs/xfs/xfs_attr_inactive.c
Diffstat (limited to 'fs/xfs/xfs_log.h')
-rw-r--r-- | fs/xfs/xfs_log.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index 84e0deb..fa27aae 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h @@ -111,15 +111,6 @@ static inline xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2) #define XFS_LSN_CMP(x,y) _lsn_cmp(x,y) /* - * Macros, structures, prototypes for interface to the log manager. - */ - -/* - * Flags to xfs_log_done() - */ -#define XFS_LOG_REL_PERM_RESERV 0x1 - -/* * Flags to xfs_log_force() * * XFS_LOG_SYNC: Synchronous force in-core log to disk @@ -138,7 +129,7 @@ struct xfs_log_callback; xfs_lsn_t xfs_log_done(struct xfs_mount *mp, struct xlog_ticket *ticket, struct xlog_in_core **iclog, - uint flags); + bool regrant); int _xfs_log_force(struct xfs_mount *mp, uint flags, int *log_forced); @@ -183,7 +174,7 @@ struct xlog_ticket *xfs_log_ticket_get(struct xlog_ticket *ticket); void xfs_log_ticket_put(struct xlog_ticket *ticket); void xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp, - xfs_lsn_t *commit_lsn, int flags); + xfs_lsn_t *commit_lsn, bool regrant); bool xfs_log_item_in_current_chkpt(struct xfs_log_item *lip); void xfs_log_work_queue(struct xfs_mount *mp); |