diff options
Diffstat (limited to 'fs/xfs/xfs_log.h')
| -rw-r--r-- | fs/xfs/xfs_log.h | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index 18961119fc65..158829ca56f6 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h | |||
| @@ -1,33 +1,19 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. | 2 | * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc. |
| 3 | * All Rights Reserved. | ||
| 3 | * | 4 | * |
| 4 | * This program is free software; you can redistribute it and/or modify it | 5 | * This program is free software; you can redistribute it and/or |
| 5 | * under the terms of version 2 of the GNU General Public License as | 6 | * modify it under the terms of the GNU General Public License as |
| 6 | * published by the Free Software Foundation. | 7 | * published by the Free Software Foundation. |
| 7 | * | 8 | * |
| 8 | * This program is distributed in the hope that it would be useful, but | 9 | * This program is distributed in the hope that it would be useful, |
| 9 | * WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 | * GNU General Public License for more details. | ||
| 11 | * | 13 | * |
| 12 | * Further, this software is distributed without any warranty that it is | 14 | * You should have received a copy of the GNU General Public License |
| 13 | * free of the rightful claim of any third person regarding infringement | 15 | * along with this program; if not, write the Free Software Foundation, |
| 14 | * or the like. Any license provided herein, whether implied or | 16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 15 | * otherwise, applies only to this software file. Patent licenses, if | ||
| 16 | * any, provided herein do not apply to combinations of this program with | ||
| 17 | * other software, or any other product whatsoever. | ||
| 18 | * | ||
| 19 | * You should have received a copy of the GNU General Public License along | ||
| 20 | * with this program; if not, write the Free Software Foundation, Inc., 59 | ||
| 21 | * Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
| 22 | * | ||
| 23 | * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, | ||
| 24 | * Mountain View, CA 94043, or: | ||
| 25 | * | ||
| 26 | * http://www.sgi.com | ||
| 27 | * | ||
| 28 | * For further information regarding this notice, see: | ||
| 29 | * | ||
| 30 | * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ | ||
| 31 | */ | 17 | */ |
| 32 | #ifndef __XFS_LOG_H__ | 18 | #ifndef __XFS_LOG_H__ |
| 33 | #define __XFS_LOG_H__ | 19 | #define __XFS_LOG_H__ |
| @@ -174,9 +160,12 @@ xfs_lsn_t xfs_log_done(struct xfs_mount *mp, | |||
| 174 | xfs_log_ticket_t ticket, | 160 | xfs_log_ticket_t ticket, |
| 175 | void **iclog, | 161 | void **iclog, |
| 176 | uint flags); | 162 | uint flags); |
| 177 | int xfs_log_force(struct xfs_mount *mp, | 163 | int _xfs_log_force(struct xfs_mount *mp, |
| 178 | xfs_lsn_t lsn, | 164 | xfs_lsn_t lsn, |
| 179 | uint flags); | 165 | uint flags, |
| 166 | int *log_forced); | ||
| 167 | #define xfs_log_force(mp, lsn, flags) \ | ||
| 168 | _xfs_log_force(mp, lsn, flags, NULL); | ||
| 180 | int xfs_log_mount(struct xfs_mount *mp, | 169 | int xfs_log_mount(struct xfs_mount *mp, |
| 181 | struct xfs_buftarg *log_target, | 170 | struct xfs_buftarg *log_target, |
| 182 | xfs_daddr_t start_block, | 171 | xfs_daddr_t start_block, |