diff options
Diffstat (limited to 'fs/jfs/jfs_logmgr.c')
-rw-r--r-- | fs/jfs/jfs_logmgr.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 3315f0b1fbc0..b89c9aba0466 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c | |||
@@ -4,16 +4,16 @@ | |||
4 | * | 4 | * |
5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
7 | * the Free Software Foundation; either version 2 of the License, or | 7 | * the Free Software Foundation; either version 2 of the License, or |
8 | * (at your option) any later version. | 8 | * (at your option) any later version. |
9 | * | 9 | * |
10 | * This program is distributed in the hope that it will be useful, | 10 | * This program is distributed in the hope that it will be useful, |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See |
13 | * the GNU General Public License for more details. | 13 | * the GNU General Public License for more details. |
14 | * | 14 | * |
15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
16 | * along with this program; if not, write to the Free Software | 16 | * along with this program; if not, write to the Free Software |
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 | */ | 18 | */ |
19 | 19 | ||
@@ -337,7 +337,7 @@ int lmLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd, | |||
337 | * PARAMETER: cd - commit descriptor | 337 | * PARAMETER: cd - commit descriptor |
338 | * | 338 | * |
339 | * RETURN: end-of-log address | 339 | * RETURN: end-of-log address |
340 | * | 340 | * |
341 | * serialization: LOG_LOCK() held on entry/exit | 341 | * serialization: LOG_LOCK() held on entry/exit |
342 | */ | 342 | */ |
343 | static int | 343 | static int |
@@ -554,7 +554,7 @@ lmWriteRecord(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd, | |||
554 | * PARAMETER: log | 554 | * PARAMETER: log |
555 | * | 555 | * |
556 | * RETURN: 0 | 556 | * RETURN: 0 |
557 | * | 557 | * |
558 | * serialization: LOG_LOCK() held on entry/exit | 558 | * serialization: LOG_LOCK() held on entry/exit |
559 | */ | 559 | */ |
560 | static int lmNextPage(struct jfs_log * log) | 560 | static int lmNextPage(struct jfs_log * log) |
@@ -656,7 +656,7 @@ static int lmNextPage(struct jfs_log * log) | |||
656 | * page number - redrive pageout of the page at the head of | 656 | * page number - redrive pageout of the page at the head of |
657 | * pageout queue until full page has been written. | 657 | * pageout queue until full page has been written. |
658 | * | 658 | * |
659 | * RETURN: | 659 | * RETURN: |
660 | * | 660 | * |
661 | * NOTE: | 661 | * NOTE: |
662 | * LOGGC_LOCK serializes log group commit queue, and | 662 | * LOGGC_LOCK serializes log group commit queue, and |
@@ -920,10 +920,10 @@ static void lmPostGC(struct lbuf * bp) | |||
920 | * this code is called again. | 920 | * this code is called again. |
921 | * | 921 | * |
922 | * PARAMETERS: log - log structure | 922 | * PARAMETERS: log - log structure |
923 | * hard_sync - 1 to force all metadata to be written | 923 | * hard_sync - 1 to force all metadata to be written |
924 | * | 924 | * |
925 | * RETURN: 0 | 925 | * RETURN: 0 |
926 | * | 926 | * |
927 | * serialization: LOG_LOCK() held on entry/exit | 927 | * serialization: LOG_LOCK() held on entry/exit |
928 | */ | 928 | */ |
929 | static int lmLogSync(struct jfs_log * log, int hard_sync) | 929 | static int lmLogSync(struct jfs_log * log, int hard_sync) |
@@ -1052,7 +1052,7 @@ static int lmLogSync(struct jfs_log * log, int hard_sync) | |||
1052 | * FUNCTION: write log SYNCPT record for specified log | 1052 | * FUNCTION: write log SYNCPT record for specified log |
1053 | * | 1053 | * |
1054 | * PARAMETERS: log - log structure | 1054 | * PARAMETERS: log - log structure |
1055 | * hard_sync - set to 1 to force metadata to be written | 1055 | * hard_sync - set to 1 to force metadata to be written |
1056 | */ | 1056 | */ |
1057 | void jfs_syncpt(struct jfs_log *log, int hard_sync) | 1057 | void jfs_syncpt(struct jfs_log *log, int hard_sync) |
1058 | { LOG_LOCK(log); | 1058 | { LOG_LOCK(log); |
@@ -1067,7 +1067,7 @@ void jfs_syncpt(struct jfs_log *log, int hard_sync) | |||
1067 | * insert filesystem in the active list of the log. | 1067 | * insert filesystem in the active list of the log. |
1068 | * | 1068 | * |
1069 | * PARAMETER: ipmnt - file system mount inode | 1069 | * PARAMETER: ipmnt - file system mount inode |
1070 | * iplog - log inode (out) | 1070 | * iplog - log inode (out) |
1071 | * | 1071 | * |
1072 | * RETURN: | 1072 | * RETURN: |
1073 | * | 1073 | * |
@@ -1082,7 +1082,7 @@ int lmLogOpen(struct super_block *sb) | |||
1082 | 1082 | ||
1083 | if (sbi->flag & JFS_NOINTEGRITY) | 1083 | if (sbi->flag & JFS_NOINTEGRITY) |
1084 | return open_dummy_log(sb); | 1084 | return open_dummy_log(sb); |
1085 | 1085 | ||
1086 | if (sbi->mntflag & JFS_INLINELOG) | 1086 | if (sbi->mntflag & JFS_INLINELOG) |
1087 | return open_inline_log(sb); | 1087 | return open_inline_log(sb); |
1088 | 1088 | ||
@@ -1131,7 +1131,7 @@ int lmLogOpen(struct super_block *sb) | |||
1131 | 1131 | ||
1132 | log->bdev = bdev; | 1132 | log->bdev = bdev; |
1133 | memcpy(log->uuid, sbi->loguuid, sizeof(log->uuid)); | 1133 | memcpy(log->uuid, sbi->loguuid, sizeof(log->uuid)); |
1134 | 1134 | ||
1135 | /* | 1135 | /* |
1136 | * initialize log: | 1136 | * initialize log: |
1137 | */ | 1137 | */ |
@@ -1253,13 +1253,13 @@ static int open_dummy_log(struct super_block *sb) | |||
1253 | * initialize the log from log superblock. | 1253 | * initialize the log from log superblock. |
1254 | * set the log state in the superblock to LOGMOUNT and | 1254 | * set the log state in the superblock to LOGMOUNT and |
1255 | * write SYNCPT log record. | 1255 | * write SYNCPT log record. |
1256 | * | 1256 | * |
1257 | * PARAMETER: log - log structure | 1257 | * PARAMETER: log - log structure |
1258 | * | 1258 | * |
1259 | * RETURN: 0 - if ok | 1259 | * RETURN: 0 - if ok |
1260 | * -EINVAL - bad log magic number or superblock dirty | 1260 | * -EINVAL - bad log magic number or superblock dirty |
1261 | * error returned from logwait() | 1261 | * error returned from logwait() |
1262 | * | 1262 | * |
1263 | * serialization: single first open thread | 1263 | * serialization: single first open thread |
1264 | */ | 1264 | */ |
1265 | int lmLogInit(struct jfs_log * log) | 1265 | int lmLogInit(struct jfs_log * log) |
@@ -1297,7 +1297,7 @@ int lmLogInit(struct jfs_log * log) | |||
1297 | 1297 | ||
1298 | if (!test_bit(log_INLINELOG, &log->flag)) | 1298 | if (!test_bit(log_INLINELOG, &log->flag)) |
1299 | log->l2bsize = L2LOGPSIZE; | 1299 | log->l2bsize = L2LOGPSIZE; |
1300 | 1300 | ||
1301 | /* check for disabled journaling to disk */ | 1301 | /* check for disabled journaling to disk */ |
1302 | if (log->no_integrity) { | 1302 | if (log->no_integrity) { |
1303 | /* | 1303 | /* |
@@ -1651,7 +1651,7 @@ void jfs_flush_journal(struct jfs_log *log, int wait) | |||
1651 | * PARAMETER: log - log inode | 1651 | * PARAMETER: log - log inode |
1652 | * | 1652 | * |
1653 | * RETURN: 0 - success | 1653 | * RETURN: 0 - success |
1654 | * | 1654 | * |
1655 | * serialization: single last close thread | 1655 | * serialization: single last close thread |
1656 | */ | 1656 | */ |
1657 | int lmLogShutdown(struct jfs_log * log) | 1657 | int lmLogShutdown(struct jfs_log * log) |
@@ -1677,7 +1677,7 @@ int lmLogShutdown(struct jfs_log * log) | |||
1677 | lrd.type = cpu_to_le16(LOG_SYNCPT); | 1677 | lrd.type = cpu_to_le16(LOG_SYNCPT); |
1678 | lrd.length = 0; | 1678 | lrd.length = 0; |
1679 | lrd.log.syncpt.sync = 0; | 1679 | lrd.log.syncpt.sync = 0; |
1680 | 1680 | ||
1681 | lsn = lmWriteRecord(log, NULL, &lrd, NULL); | 1681 | lsn = lmWriteRecord(log, NULL, &lrd, NULL); |
1682 | bp = log->bp; | 1682 | bp = log->bp; |
1683 | lp = (struct logpage *) bp->l_ldata; | 1683 | lp = (struct logpage *) bp->l_ldata; |
@@ -1703,7 +1703,7 @@ int lmLogShutdown(struct jfs_log * log) | |||
1703 | jfs_info("lmLogShutdown: lsn:0x%x page:%d eor:%d", | 1703 | jfs_info("lmLogShutdown: lsn:0x%x page:%d eor:%d", |
1704 | lsn, log->page, log->eor); | 1704 | lsn, log->page, log->eor); |
1705 | 1705 | ||
1706 | out: | 1706 | out: |
1707 | /* | 1707 | /* |
1708 | * shutdown per log i/o | 1708 | * shutdown per log i/o |
1709 | */ | 1709 | */ |
@@ -1769,7 +1769,7 @@ static int lmLogFileSystem(struct jfs_log * log, struct jfs_sb_info *sbi, | |||
1769 | lbmFree(bpsuper); | 1769 | lbmFree(bpsuper); |
1770 | return -EIO; | 1770 | return -EIO; |
1771 | } | 1771 | } |
1772 | 1772 | ||
1773 | } | 1773 | } |
1774 | 1774 | ||
1775 | /* | 1775 | /* |