aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fs/ocfs2/alloc.c26
-rw-r--r--fs/ocfs2/aops.c19
-rw-r--r--fs/ocfs2/buffer_head_io.c7
-rw-r--r--fs/ocfs2/cluster/heartbeat.c1
-rw-r--r--fs/ocfs2/cluster/masklog.c3
-rw-r--r--fs/ocfs2/cluster/masklog.h44
-rw-r--r--fs/ocfs2/dcache.c3
-rw-r--r--fs/ocfs2/dir.c20
-rw-r--r--fs/ocfs2/dlm/dlmrecovery.c5
-rw-r--r--fs/ocfs2/dlmglue.c71
-rw-r--r--fs/ocfs2/export.c6
-rw-r--r--fs/ocfs2/extent_map.c1
-rw-r--r--fs/ocfs2/file.c21
-rw-r--r--fs/ocfs2/inode.c15
-rw-r--r--fs/ocfs2/ioctl.c2
-rw-r--r--fs/ocfs2/journal.c19
-rw-r--r--fs/ocfs2/localalloc.c35
-rw-r--r--fs/ocfs2/mmap.c2
-rw-r--r--fs/ocfs2/namei.c47
-rw-r--r--fs/ocfs2/quota_global.c17
-rw-r--r--fs/ocfs2/quota_local.c3
-rw-r--r--fs/ocfs2/resize.c6
-rw-r--r--fs/ocfs2/slot_map.c1
-rw-r--r--fs/ocfs2/suballoc.c54
-rw-r--r--fs/ocfs2/super.c37
-rw-r--r--fs/ocfs2/symlink.c7
-rw-r--r--fs/ocfs2/xattr.c2
27 files changed, 159 insertions, 315 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 47a6ce84e67f..80ffbe3dd32f 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -985,7 +985,7 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb,
985bail: 985bail:
986 brelse(eb_bh); 986 brelse(eb_bh);
987 987
988 mlog_exit(retval); 988 mlog(0, "retval = %d\n", retval);
989 return retval; 989 return retval;
990} 990}
991 991
@@ -1070,8 +1070,8 @@ bail:
1070 brelse(bhs[i]); 1070 brelse(bhs[i]);
1071 bhs[i] = NULL; 1071 bhs[i] = NULL;
1072 } 1072 }
1073 mlog_errno(status);
1073 } 1074 }
1074 mlog_exit(status);
1075 return status; 1075 return status;
1076} 1076}
1077 1077
@@ -1326,7 +1326,6 @@ bail:
1326 kfree(new_eb_bhs); 1326 kfree(new_eb_bhs);
1327 } 1327 }
1328 1328
1329 mlog_exit(status);
1330 return status; 1329 return status;
1331} 1330}
1332 1331
@@ -1407,7 +1406,6 @@ static int ocfs2_shift_tree_depth(handle_t *handle,
1407bail: 1406bail:
1408 brelse(new_eb_bh); 1407 brelse(new_eb_bh);
1409 1408
1410 mlog_exit(status);
1411 return status; 1409 return status;
1412} 1410}
1413 1411
@@ -1493,7 +1491,6 @@ static int ocfs2_find_branch_target(struct ocfs2_extent_tree *et,
1493bail: 1491bail:
1494 brelse(bh); 1492 brelse(bh);
1495 1493
1496 mlog_exit(status);
1497 return status; 1494 return status;
1498} 1495}
1499 1496
@@ -4552,7 +4549,7 @@ static int ocfs2_figure_insert_type(struct ocfs2_extent_tree *et,
4552 ocfs2_et_get_last_eb_blk(et), 4549 ocfs2_et_get_last_eb_blk(et),
4553 &bh); 4550 &bh);
4554 if (ret) { 4551 if (ret) {
4555 mlog_exit(ret); 4552 mlog_errno(ret);
4556 goto out; 4553 goto out;
4557 } 4554 }
4558 eb = (struct ocfs2_extent_block *) bh->b_data; 4555 eb = (struct ocfs2_extent_block *) bh->b_data;
@@ -4716,7 +4713,6 @@ int ocfs2_insert_extent(handle_t *handle,
4716bail: 4713bail:
4717 brelse(last_eb_bh); 4714 brelse(last_eb_bh);
4718 4715
4719 mlog_exit(status);
4720 return status; 4716 return status;
4721} 4717}
4722 4718
@@ -4818,7 +4814,6 @@ int ocfs2_add_clusters_in_btree(handle_t *handle,
4818 } 4814 }
4819 4815
4820leave: 4816leave:
4821 mlog_exit(status);
4822 if (reason_ret) 4817 if (reason_ret)
4823 *reason_ret = reason; 4818 *reason_ret = reason;
4824 return status; 4819 return status;
@@ -5029,7 +5024,7 @@ int ocfs2_split_extent(handle_t *handle,
5029 ocfs2_et_get_last_eb_blk(et), 5024 ocfs2_et_get_last_eb_blk(et),
5030 &last_eb_bh); 5025 &last_eb_bh);
5031 if (ret) { 5026 if (ret) {
5032 mlog_exit(ret); 5027 mlog_errno(ret);
5033 goto out; 5028 goto out;
5034 } 5029 }
5035 5030
@@ -5849,7 +5844,6 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb,
5849 5844
5850 osb->truncated_clusters += num_clusters; 5845 osb->truncated_clusters += num_clusters;
5851bail: 5846bail:
5852 mlog_exit(status);
5853 return status; 5847 return status;
5854} 5848}
5855 5849
@@ -5920,7 +5914,6 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
5920 osb->truncated_clusters = 0; 5914 osb->truncated_clusters = 0;
5921 5915
5922bail: 5916bail:
5923 mlog_exit(status);
5924 return status; 5917 return status;
5925} 5918}
5926 5919
@@ -5995,7 +5988,6 @@ out_mutex:
5995 iput(data_alloc_inode); 5988 iput(data_alloc_inode);
5996 5989
5997out: 5990out:
5998 mlog_exit(status);
5999 return status; 5991 return status;
6000} 5992}
6001 5993
@@ -6023,8 +6015,6 @@ static void ocfs2_truncate_log_worker(struct work_struct *work)
6023 mlog_errno(status); 6015 mlog_errno(status);
6024 else 6016 else
6025 ocfs2_init_steal_slots(osb); 6017 ocfs2_init_steal_slots(osb);
6026
6027 mlog_exit(status);
6028} 6018}
6029 6019
6030#define OCFS2_TRUNCATE_LOG_FLUSH_INTERVAL (2 * HZ) 6020#define OCFS2_TRUNCATE_LOG_FLUSH_INTERVAL (2 * HZ)
@@ -6070,7 +6060,6 @@ static int ocfs2_get_truncate_log_info(struct ocfs2_super *osb,
6070 *tl_inode = inode; 6060 *tl_inode = inode;
6071 *tl_bh = bh; 6061 *tl_bh = bh;
6072bail: 6062bail:
6073 mlog_exit(status);
6074 return status; 6063 return status;
6075} 6064}
6076 6065
@@ -6141,9 +6130,9 @@ bail:
6141 if (status < 0 && (*tl_copy)) { 6130 if (status < 0 && (*tl_copy)) {
6142 kfree(*tl_copy); 6131 kfree(*tl_copy);
6143 *tl_copy = NULL; 6132 *tl_copy = NULL;
6133 mlog_errno(status);
6144 } 6134 }
6145 6135
6146 mlog_exit(status);
6147 return status; 6136 return status;
6148} 6137}
6149 6138
@@ -6201,7 +6190,6 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
6201bail_up: 6190bail_up:
6202 mutex_unlock(&tl_inode->i_mutex); 6191 mutex_unlock(&tl_inode->i_mutex);
6203 6192
6204 mlog_exit(status);
6205 return status; 6193 return status;
6206} 6194}
6207 6195
@@ -6221,8 +6209,6 @@ void ocfs2_truncate_log_shutdown(struct ocfs2_super *osb)
6221 brelse(osb->osb_tl_bh); 6209 brelse(osb->osb_tl_bh);
6222 iput(osb->osb_tl_inode); 6210 iput(osb->osb_tl_inode);
6223 } 6211 }
6224
6225 mlog_exit_void();
6226} 6212}
6227 6213
6228int ocfs2_truncate_log_init(struct ocfs2_super *osb) 6214int ocfs2_truncate_log_init(struct ocfs2_super *osb)
@@ -6246,7 +6232,6 @@ int ocfs2_truncate_log_init(struct ocfs2_super *osb)
6246 osb->osb_tl_bh = tl_bh; 6232 osb->osb_tl_bh = tl_bh;
6247 osb->osb_tl_inode = tl_inode; 6233 osb->osb_tl_inode = tl_inode;
6248 6234
6249 mlog_exit(status);
6250 return status; 6235 return status;
6251} 6236}
6252 6237
@@ -7112,7 +7097,6 @@ bail:
7112 7097
7113 ocfs2_free_path(path); 7098 ocfs2_free_path(path);
7114 7099
7115 mlog_exit(status);
7116 return status; 7100 return status;
7117} 7101}
7118 7102
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 5dbfc9e45195..9551518be435 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -123,7 +123,6 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
123bail: 123bail:
124 brelse(bh); 124 brelse(bh);
125 125
126 mlog_exit(err);
127 return err; 126 return err;
128} 127}
129 128
@@ -208,7 +207,6 @@ bail:
208 if (err < 0) 207 if (err < 0)
209 err = -EIO; 208 err = -EIO;
210 209
211 mlog_exit(err);
212 return err; 210 return err;
213} 211}
214 212
@@ -323,7 +321,6 @@ out_inode_unlock:
323out: 321out:
324 if (unlock) 322 if (unlock)
325 unlock_page(page); 323 unlock_page(page);
326 mlog_exit(ret);
327 return ret; 324 return ret;
328} 325}
329 326
@@ -402,8 +399,6 @@ static int ocfs2_writepage(struct page *page, struct writeback_control *wbc)
402 399
403 ret = block_write_full_page(page, ocfs2_get_block, wbc); 400 ret = block_write_full_page(page, ocfs2_get_block, wbc);
404 401
405 mlog_exit(ret);
406
407 return ret; 402 return ret;
408} 403}
409 404
@@ -484,8 +479,6 @@ static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block)
484bail: 479bail:
485 status = err ? 0 : p_blkno; 480 status = err ? 0 : p_blkno;
486 481
487 mlog_exit((int)status);
488
489 return status; 482 return status;
490} 483}
491 484
@@ -616,7 +609,6 @@ static ssize_t ocfs2_direct_IO(int rw,
616{ 609{
617 struct file *file = iocb->ki_filp; 610 struct file *file = iocb->ki_filp;
618 struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host; 611 struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host;
619 int ret;
620 612
621 /* 613 /*
622 * Fallback to buffered I/O if we see an inode without 614 * Fallback to buffered I/O if we see an inode without
@@ -629,13 +621,10 @@ static ssize_t ocfs2_direct_IO(int rw,
629 if (i_size_read(inode) <= offset) 621 if (i_size_read(inode) <= offset)
630 return 0; 622 return 0;
631 623
632 ret = __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, 624 return __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev,
633 iov, offset, nr_segs, 625 iov, offset, nr_segs,
634 ocfs2_direct_IO_get_blocks, 626 ocfs2_direct_IO_get_blocks,
635 ocfs2_dio_end_io, NULL, 0); 627 ocfs2_dio_end_io, NULL, 0);
636
637 mlog_exit(ret);
638 return ret;
639} 628}
640 629
641static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb, 630static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb,
diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c
index 024bd45b7a48..c23846dbfc8f 100644
--- a/fs/ocfs2/buffer_head_io.c
+++ b/fs/ocfs2/buffer_head_io.c
@@ -66,6 +66,7 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
66 * can get modified during recovery even if read-only. */ 66 * can get modified during recovery even if read-only. */
67 if (ocfs2_is_hard_readonly(osb)) { 67 if (ocfs2_is_hard_readonly(osb)) {
68 ret = -EROFS; 68 ret = -EROFS;
69 mlog_errno(ret);
69 goto out; 70 goto out;
70 } 71 }
71 72
@@ -91,11 +92,11 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
91 * uptodate. */ 92 * uptodate. */
92 ret = -EIO; 93 ret = -EIO;
93 put_bh(bh); 94 put_bh(bh);
95 mlog_errno(ret);
94 } 96 }
95 97
96 ocfs2_metadata_cache_io_unlock(ci); 98 ocfs2_metadata_cache_io_unlock(ci);
97out: 99out:
98 mlog_exit(ret);
99 return ret; 100 return ret;
100} 101}
101 102
@@ -374,7 +375,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
374 375
375bail: 376bail:
376 377
377 mlog_exit(status);
378 return status; 378 return status;
379} 379}
380 380
@@ -413,6 +413,7 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
413 413
414 if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) { 414 if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb)) {
415 ret = -EROFS; 415 ret = -EROFS;
416 mlog_errno(ret);
416 goto out; 417 goto out;
417 } 418 }
418 419
@@ -432,9 +433,9 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
432 if (!buffer_uptodate(bh)) { 433 if (!buffer_uptodate(bh)) {
433 ret = -EIO; 434 ret = -EIO;
434 put_bh(bh); 435 put_bh(bh);
436 mlog_errno(ret);
435 } 437 }
436 438
437out: 439out:
438 mlog_exit(ret);
439 return ret; 440 return ret;
440} 441}
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 929178ce17a2..fc9e96a03a6b 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1679,7 +1679,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg)
1679 } 1679 }
1680 1680
1681out: 1681out:
1682 mlog_exit(ret);
1683 return ret; 1682 return ret;
1684} 1683}
1685 1684
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index bac64570c525..fdc302ddafe8 100644
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -30,7 +30,7 @@
30 30
31struct mlog_bits mlog_and_bits = MLOG_BITS_RHS(MLOG_INITIAL_AND_MASK); 31struct mlog_bits mlog_and_bits = MLOG_BITS_RHS(MLOG_INITIAL_AND_MASK);
32EXPORT_SYMBOL_GPL(mlog_and_bits); 32EXPORT_SYMBOL_GPL(mlog_and_bits);
33struct mlog_bits mlog_not_bits = MLOG_BITS_RHS(MLOG_INITIAL_NOT_MASK); 33struct mlog_bits mlog_not_bits = MLOG_BITS_RHS(0);
34EXPORT_SYMBOL_GPL(mlog_not_bits); 34EXPORT_SYMBOL_GPL(mlog_not_bits);
35 35
36static ssize_t mlog_mask_show(u64 mask, char *buf) 36static ssize_t mlog_mask_show(u64 mask, char *buf)
@@ -80,7 +80,6 @@ struct mlog_attribute {
80} 80}
81 81
82static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = { 82static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = {
83 define_mask(EXIT),
84 define_mask(TCP), 83 define_mask(TCP),
85 define_mask(MSG), 84 define_mask(MSG),
86 define_mask(SOCKET), 85 define_mask(SOCKET),
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h
index 6e20877436b9..51ee790c7678 100644
--- a/fs/ocfs2/cluster/masklog.h
+++ b/fs/ocfs2/cluster/masklog.h
@@ -82,7 +82,6 @@
82 82
83/* bits that are frequently given and infrequently matched in the low word */ 83/* bits that are frequently given and infrequently matched in the low word */
84/* NOTE: If you add a flag, you need to also update masklog.c! */ 84/* NOTE: If you add a flag, you need to also update masklog.c! */
85#define ML_EXIT 0x0000000000000002ULL /* func call exit */
86#define ML_TCP 0x0000000000000004ULL /* net cluster/tcp.c */ 85#define ML_TCP 0x0000000000000004ULL /* net cluster/tcp.c */
87#define ML_MSG 0x0000000000000008ULL /* net network messages */ 86#define ML_MSG 0x0000000000000008ULL /* net network messages */
88#define ML_SOCKET 0x0000000000000010ULL /* net socket lifetime */ 87#define ML_SOCKET 0x0000000000000010ULL /* net socket lifetime */
@@ -123,7 +122,6 @@
123#define ML_KTHREAD 0x4000000000000000ULL /* kernel thread activity */ 122#define ML_KTHREAD 0x4000000000000000ULL /* kernel thread activity */
124 123
125#define MLOG_INITIAL_AND_MASK (ML_ERROR|ML_NOTICE) 124#define MLOG_INITIAL_AND_MASK (ML_ERROR|ML_NOTICE)
126#define MLOG_INITIAL_NOT_MASK (ML_EXIT)
127#ifndef MLOG_MASK_PREFIX 125#ifndef MLOG_MASK_PREFIX
128#define MLOG_MASK_PREFIX 0 126#define MLOG_MASK_PREFIX 0
129#endif 127#endif
@@ -221,48 +219,6 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits;
221 mlog(ML_ERROR, "status = %lld\n", (long long)_st); \ 219 mlog(ML_ERROR, "status = %lld\n", (long long)_st); \
222} while (0) 220} while (0)
223 221
224#if defined(CONFIG_OCFS2_DEBUG_MASKLOG)
225/*
226 * We disable this for sparse.
227 */
228#if !defined(__CHECKER__)
229#define mlog_exit(st) do { \
230 if (__builtin_types_compatible_p(typeof(st), unsigned long)) \
231 mlog(ML_EXIT, "EXIT: %lu\n", (unsigned long) (st)); \
232 else if (__builtin_types_compatible_p(typeof(st), signed long)) \
233 mlog(ML_EXIT, "EXIT: %ld\n", (signed long) (st)); \
234 else if (__builtin_types_compatible_p(typeof(st), unsigned int) \
235 || __builtin_types_compatible_p(typeof(st), unsigned short) \
236 || __builtin_types_compatible_p(typeof(st), unsigned char)) \
237 mlog(ML_EXIT, "EXIT: %u\n", (unsigned int) (st)); \
238 else if (__builtin_types_compatible_p(typeof(st), signed int) \
239 || __builtin_types_compatible_p(typeof(st), signed short) \
240 || __builtin_types_compatible_p(typeof(st), signed char)) \
241 mlog(ML_EXIT, "EXIT: %d\n", (signed int) (st)); \
242 else if (__builtin_types_compatible_p(typeof(st), long long)) \
243 mlog(ML_EXIT, "EXIT: %lld\n", (long long) (st)); \
244 else \
245 mlog(ML_EXIT, "EXIT: %llu\n", (unsigned long long) (st)); \
246} while (0)
247#else
248#define mlog_exit(st) do { \
249 mlog(ML_EXIT, "EXIT: %lld\n", (long long) (st)); \
250} while (0)
251#endif
252
253#define mlog_exit_ptr(ptr) do { \
254 mlog(ML_EXIT, "EXIT: %p\n", ptr); \
255} while (0)
256
257#define mlog_exit_void() do { \
258 mlog(ML_EXIT, "EXIT\n"); \
259} while (0)
260#else
261#define mlog_exit(...) do { } while (0)
262#define mlog_exit_ptr(...) do { } while (0)
263#define mlog_exit_void(...) do { } while (0)
264#endif /* defined(CONFIG_OCFS2_DEBUG_MASKLOG) */
265
266#define mlog_bug_on_msg(cond, fmt, args...) do { \ 222#define mlog_bug_on_msg(cond, fmt, args...) do { \
267 if (cond) { \ 223 if (cond) { \
268 mlog(ML_ERROR, "bug expression: " #cond "\n"); \ 224 mlog(ML_ERROR, "bug expression: " #cond "\n"); \
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index 67d17a45773b..c26551c25e8e 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -123,8 +123,7 @@ valid:
123 ret = 1; 123 ret = 1;
124 124
125bail: 125bail:
126 mlog_exit(ret); 126 mlog(0, "ret = %d\n", ret);
127
128 return ret; 127 return ret;
129} 128}
130 129
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 2c983f083f8a..2fc6c3673bea 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -400,7 +400,7 @@ static int inline ocfs2_search_dirblock(struct buffer_head *bh,
400 } 400 }
401 401
402bail: 402bail:
403 mlog_exit(ret); 403 mlog(0, "ret = %d\n", ret);
404 return ret; 404 return ret;
405} 405}
406 406
@@ -784,7 +784,7 @@ cleanup_and_exit:
784 for (; ra_ptr < ra_max; ra_ptr++) 784 for (; ra_ptr < ra_max; ra_ptr++)
785 brelse(bh_use[ra_ptr]); 785 brelse(bh_use[ra_ptr]);
786 786
787 mlog_exit_ptr(ret); 787 mlog(0, "ret = %p\n", ret);
788 return ret; 788 return ret;
789} 789}
790 790
@@ -1198,7 +1198,6 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir,
1198 de = (struct ocfs2_dir_entry *)((char *)de + le16_to_cpu(de->rec_len)); 1198 de = (struct ocfs2_dir_entry *)((char *)de + le16_to_cpu(de->rec_len));
1199 } 1199 }
1200bail: 1200bail:
1201 mlog_exit(status);
1202 return status; 1201 return status;
1203} 1202}
1204 1203
@@ -1759,8 +1758,9 @@ int __ocfs2_add_entry(handle_t *handle,
1759 * from ever getting here. */ 1758 * from ever getting here. */
1760 retval = -ENOSPC; 1759 retval = -ENOSPC;
1761bail: 1760bail:
1761 if (retval)
1762 mlog_errno(retval);
1762 1763
1763 mlog_exit(retval);
1764 return retval; 1764 return retval;
1765} 1765}
1766 1766
@@ -2045,9 +2045,10 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
2045 dirent, filldir, NULL); 2045 dirent, filldir, NULL);
2046 2046
2047 ocfs2_inode_unlock(inode, lock_level); 2047 ocfs2_inode_unlock(inode, lock_level);
2048 if (error)
2049 mlog_errno(error);
2048 2050
2049bail_nolock: 2051bail_nolock:
2050 mlog_exit(error);
2051 2052
2052 return error; 2053 return error;
2053} 2054}
@@ -2119,7 +2120,8 @@ int ocfs2_check_dir_for_entry(struct inode *dir,
2119bail: 2120bail:
2120 ocfs2_free_dir_lookup_result(&lookup); 2121 ocfs2_free_dir_lookup_result(&lookup);
2121 2122
2122 mlog_exit(ret); 2123 if (ret)
2124 mlog_errno(ret);
2123 return ret; 2125 return ret;
2124} 2126}
2125 2127
@@ -2372,7 +2374,6 @@ static int ocfs2_fill_new_dir_el(struct ocfs2_super *osb,
2372bail: 2374bail:
2373 brelse(new_bh); 2375 brelse(new_bh);
2374 2376
2375 mlog_exit(status);
2376 return status; 2377 return status;
2377} 2378}
2378 2379
@@ -3227,7 +3228,6 @@ static int ocfs2_do_extend_dir(struct super_block *sb,
3227bail: 3228bail:
3228 if (did_quota && status < 0) 3229 if (did_quota && status < 0)
3229 dquot_free_space_nodirty(dir, ocfs2_clusters_to_bytes(sb, 1)); 3230 dquot_free_space_nodirty(dir, ocfs2_clusters_to_bytes(sb, 1));
3230 mlog_exit(status);
3231 return status; 3231 return status;
3232} 3232}
3233 3233
@@ -3426,7 +3426,6 @@ bail:
3426 3426
3427 brelse(new_bh); 3427 brelse(new_bh);
3428 3428
3429 mlog_exit(status);
3430 return status; 3429 return status;
3431} 3430}
3432 3431
@@ -3573,8 +3572,9 @@ next:
3573 status = 0; 3572 status = 0;
3574bail: 3573bail:
3575 brelse(bh); 3574 brelse(bh);
3575 if (status)
3576 mlog_errno(status);
3576 3577
3577 mlog_exit(status);
3578 return status; 3578 return status;
3579} 3579}
3580 3580
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 6602b23c2ab3..f1beb6fc254d 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -727,7 +727,6 @@ static int dlm_remaster_locks(struct dlm_ctxt *dlm, u8 dead_node)
727 if (destroy) 727 if (destroy)
728 dlm_destroy_recovery_area(dlm, dead_node); 728 dlm_destroy_recovery_area(dlm, dead_node);
729 729
730 mlog_exit(status);
731 return status; 730 return status;
732} 731}
733 732
@@ -1496,9 +1495,9 @@ leave:
1496 kfree(buf); 1495 kfree(buf);
1497 if (item) 1496 if (item)
1498 kfree(item); 1497 kfree(item);
1498 mlog_errno(ret);
1499 } 1499 }
1500 1500
1501 mlog_exit(ret);
1502 return ret; 1501 return ret;
1503} 1502}
1504 1503
@@ -1567,7 +1566,6 @@ leave:
1567 dlm_lockres_put(res); 1566 dlm_lockres_put(res);
1568 } 1567 }
1569 kfree(data); 1568 kfree(data);
1570 mlog_exit(ret);
1571} 1569}
1572 1570
1573 1571
@@ -1986,7 +1984,6 @@ leave:
1986 dlm_lock_put(newlock); 1984 dlm_lock_put(newlock);
1987 } 1985 }
1988 1986
1989 mlog_exit(ret);
1990 return ret; 1987 return ret;
1991} 1988}
1992 1989
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index c2f3fa1c4722..7eb4b8da5cbc 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -406,8 +406,6 @@ static void ocfs2_build_lock_name(enum ocfs2_lock_type type,
406 BUG_ON(len != (OCFS2_LOCK_ID_MAX_LEN - 1)); 406 BUG_ON(len != (OCFS2_LOCK_ID_MAX_LEN - 1));
407 407
408 mlog(0, "built lock resource with name: %s\n", name); 408 mlog(0, "built lock resource with name: %s\n", name);
409
410 mlog_exit_void();
411} 409}
412 410
413static DEFINE_SPINLOCK(ocfs2_dlm_tracking_lock); 411static DEFINE_SPINLOCK(ocfs2_dlm_tracking_lock);
@@ -752,7 +750,6 @@ void ocfs2_lock_res_free(struct ocfs2_lock_res *res)
752 memset(&res->l_lksb, 0, sizeof(res->l_lksb)); 750 memset(&res->l_lksb, 0, sizeof(res->l_lksb));
753 751
754 res->l_flags = 0UL; 752 res->l_flags = 0UL;
755 mlog_exit_void();
756} 753}
757 754
758static inline void ocfs2_inc_holders(struct ocfs2_lock_res *lockres, 755static inline void ocfs2_inc_holders(struct ocfs2_lock_res *lockres,
@@ -770,8 +767,6 @@ static inline void ocfs2_inc_holders(struct ocfs2_lock_res *lockres,
770 default: 767 default:
771 BUG(); 768 BUG();
772 } 769 }
773
774 mlog_exit_void();
775} 770}
776 771
777static inline void ocfs2_dec_holders(struct ocfs2_lock_res *lockres, 772static inline void ocfs2_dec_holders(struct ocfs2_lock_res *lockres,
@@ -791,7 +786,6 @@ static inline void ocfs2_dec_holders(struct ocfs2_lock_res *lockres,
791 default: 786 default:
792 BUG(); 787 BUG();
793 } 788 }
794 mlog_exit_void();
795} 789}
796 790
797/* WARNING: This function lives in a world where the only three lock 791/* WARNING: This function lives in a world where the only three lock
@@ -850,8 +844,6 @@ static inline void ocfs2_generic_handle_downconvert_action(struct ocfs2_lock_res
850 lockres_clear_flags(lockres, OCFS2_LOCK_BLOCKED); 844 lockres_clear_flags(lockres, OCFS2_LOCK_BLOCKED);
851 } 845 }
852 lockres_clear_flags(lockres, OCFS2_LOCK_BUSY); 846 lockres_clear_flags(lockres, OCFS2_LOCK_BUSY);
853
854 mlog_exit_void();
855} 847}
856 848
857static inline void ocfs2_generic_handle_convert_action(struct ocfs2_lock_res *lockres) 849static inline void ocfs2_generic_handle_convert_action(struct ocfs2_lock_res *lockres)
@@ -877,8 +869,6 @@ static inline void ocfs2_generic_handle_convert_action(struct ocfs2_lock_res *lo
877 lockres_or_flags(lockres, OCFS2_LOCK_UPCONVERT_FINISHING); 869 lockres_or_flags(lockres, OCFS2_LOCK_UPCONVERT_FINISHING);
878 870
879 lockres_clear_flags(lockres, OCFS2_LOCK_BUSY); 871 lockres_clear_flags(lockres, OCFS2_LOCK_BUSY);
880
881 mlog_exit_void();
882} 872}
883 873
884static inline void ocfs2_generic_handle_attach_action(struct ocfs2_lock_res *lockres) 874static inline void ocfs2_generic_handle_attach_action(struct ocfs2_lock_res *lockres)
@@ -894,8 +884,6 @@ static inline void ocfs2_generic_handle_attach_action(struct ocfs2_lock_res *loc
894 lockres->l_level = lockres->l_requested; 884 lockres->l_level = lockres->l_requested;
895 lockres_or_flags(lockres, OCFS2_LOCK_ATTACHED); 885 lockres_or_flags(lockres, OCFS2_LOCK_ATTACHED);
896 lockres_clear_flags(lockres, OCFS2_LOCK_BUSY); 886 lockres_clear_flags(lockres, OCFS2_LOCK_BUSY);
897
898 mlog_exit_void();
899} 887}
900 888
901static int ocfs2_generic_handle_bast(struct ocfs2_lock_res *lockres, 889static int ocfs2_generic_handle_bast(struct ocfs2_lock_res *lockres,
@@ -923,8 +911,7 @@ static int ocfs2_generic_handle_bast(struct ocfs2_lock_res *lockres,
923 911
924 if (needs_downconvert) 912 if (needs_downconvert)
925 lockres_or_flags(lockres, OCFS2_LOCK_BLOCKED); 913 lockres_or_flags(lockres, OCFS2_LOCK_BLOCKED);
926 914 mlog(0, "needs_downconvert = %d\n", needs_downconvert);
927 mlog_exit(needs_downconvert);
928 return needs_downconvert; 915 return needs_downconvert;
929} 916}
930 917
@@ -1145,7 +1132,6 @@ static void ocfs2_unlock_ast(struct ocfs2_dlm_lksb *lksb, int error)
1145 "unlock_action %d\n", error, lockres->l_name, 1132 "unlock_action %d\n", error, lockres->l_name,
1146 lockres->l_unlock_action); 1133 lockres->l_unlock_action);
1147 spin_unlock_irqrestore(&lockres->l_lock, flags); 1134 spin_unlock_irqrestore(&lockres->l_lock, flags);
1148 mlog_exit_void();
1149 return; 1135 return;
1150 } 1136 }
1151 1137
@@ -1169,8 +1155,6 @@ static void ocfs2_unlock_ast(struct ocfs2_dlm_lksb *lksb, int error)
1169 lockres->l_unlock_action = OCFS2_UNLOCK_INVALID; 1155 lockres->l_unlock_action = OCFS2_UNLOCK_INVALID;
1170 wake_up(&lockres->l_event); 1156 wake_up(&lockres->l_event);
1171 spin_unlock_irqrestore(&lockres->l_lock, flags); 1157 spin_unlock_irqrestore(&lockres->l_lock, flags);
1172
1173 mlog_exit_void();
1174} 1158}
1175 1159
1176/* 1160/*
@@ -1226,7 +1210,6 @@ static inline void ocfs2_recover_from_dlm_error(struct ocfs2_lock_res *lockres,
1226 spin_unlock_irqrestore(&lockres->l_lock, flags); 1210 spin_unlock_irqrestore(&lockres->l_lock, flags);
1227 1211
1228 wake_up(&lockres->l_event); 1212 wake_up(&lockres->l_event);
1229 mlog_exit_void();
1230} 1213}
1231 1214
1232/* Note: If we detect another process working on the lock (i.e., 1215/* Note: If we detect another process working on the lock (i.e.,
@@ -1273,7 +1256,6 @@ static int ocfs2_lock_create(struct ocfs2_super *osb,
1273 mlog(0, "lock %s, return from ocfs2_dlm_lock\n", lockres->l_name); 1256 mlog(0, "lock %s, return from ocfs2_dlm_lock\n", lockres->l_name);
1274 1257
1275bail: 1258bail:
1276 mlog_exit(ret);
1277 return ret; 1259 return ret;
1278} 1260}
1279 1261
@@ -1561,7 +1543,6 @@ out:
1561 caller_ip); 1543 caller_ip);
1562 } 1544 }
1563#endif 1545#endif
1564 mlog_exit(ret);
1565 return ret; 1546 return ret;
1566} 1547}
1567 1548
@@ -1591,7 +1572,6 @@ static void __ocfs2_cluster_unlock(struct ocfs2_super *osb,
1591 if (lockres->l_lockdep_map.key != NULL) 1572 if (lockres->l_lockdep_map.key != NULL)
1592 rwsem_release(&lockres->l_lockdep_map, 1, caller_ip); 1573 rwsem_release(&lockres->l_lockdep_map, 1, caller_ip);
1593#endif 1574#endif
1594 mlog_exit_void();
1595} 1575}
1596 1576
1597static int ocfs2_create_new_lock(struct ocfs2_super *osb, 1577static int ocfs2_create_new_lock(struct ocfs2_super *osb,
@@ -1658,7 +1638,6 @@ int ocfs2_create_new_inode_locks(struct inode *inode)
1658 } 1638 }
1659 1639
1660bail: 1640bail:
1661 mlog_exit(ret);
1662 return ret; 1641 return ret;
1663} 1642}
1664 1643
@@ -1674,10 +1653,8 @@ int ocfs2_rw_lock(struct inode *inode, int write)
1674 (unsigned long long)OCFS2_I(inode)->ip_blkno, 1653 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1675 write ? "EXMODE" : "PRMODE"); 1654 write ? "EXMODE" : "PRMODE");
1676 1655
1677 if (ocfs2_mount_local(osb)) { 1656 if (ocfs2_mount_local(osb))
1678 mlog_exit(0);
1679 return 0; 1657 return 0;
1680 }
1681 1658
1682 lockres = &OCFS2_I(inode)->ip_rw_lockres; 1659 lockres = &OCFS2_I(inode)->ip_rw_lockres;
1683 1660
@@ -1688,7 +1665,6 @@ int ocfs2_rw_lock(struct inode *inode, int write)
1688 if (status < 0) 1665 if (status < 0)
1689 mlog_errno(status); 1666 mlog_errno(status);
1690 1667
1691 mlog_exit(status);
1692 return status; 1668 return status;
1693} 1669}
1694 1670
@@ -1704,8 +1680,6 @@ void ocfs2_rw_unlock(struct inode *inode, int write)
1704 1680
1705 if (!ocfs2_mount_local(osb)) 1681 if (!ocfs2_mount_local(osb))
1706 ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level); 1682 ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);
1707
1708 mlog_exit_void();
1709} 1683}
1710 1684
1711/* 1685/*
@@ -1733,7 +1707,6 @@ int ocfs2_open_lock(struct inode *inode)
1733 mlog_errno(status); 1707 mlog_errno(status);
1734 1708
1735out: 1709out:
1736 mlog_exit(status);
1737 return status; 1710 return status;
1738} 1711}
1739 1712
@@ -1766,7 +1739,6 @@ int ocfs2_try_open_lock(struct inode *inode, int write)
1766 level, DLM_LKF_NOQUEUE, 0); 1739 level, DLM_LKF_NOQUEUE, 0);
1767 1740
1768out: 1741out:
1769 mlog_exit(status);
1770 return status; 1742 return status;
1771} 1743}
1772 1744
@@ -1792,7 +1764,7 @@ void ocfs2_open_unlock(struct inode *inode)
1792 DLM_LOCK_EX); 1764 DLM_LOCK_EX);
1793 1765
1794out: 1766out:
1795 mlog_exit_void(); 1767 return;
1796} 1768}
1797 1769
1798static int ocfs2_flock_handle_signal(struct ocfs2_lock_res *lockres, 1770static int ocfs2_flock_handle_signal(struct ocfs2_lock_res *lockres,
@@ -2028,8 +2000,6 @@ static void ocfs2_downconvert_on_unlock(struct ocfs2_super *osb,
2028 2000
2029 if (kick) 2001 if (kick)
2030 ocfs2_wake_downconvert_thread(osb); 2002 ocfs2_wake_downconvert_thread(osb);
2031
2032 mlog_exit_void();
2033} 2003}
2034 2004
2035#define OCFS2_SEC_BITS 34 2005#define OCFS2_SEC_BITS 34
@@ -2089,8 +2059,6 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode)
2089 2059
2090out: 2060out:
2091 mlog_meta_lvb(0, lockres); 2061 mlog_meta_lvb(0, lockres);
2092
2093 mlog_exit_void();
2094} 2062}
2095 2063
2096static void ocfs2_unpack_timespec(struct timespec *spec, 2064static void ocfs2_unpack_timespec(struct timespec *spec,
@@ -2136,8 +2104,6 @@ static void ocfs2_refresh_inode_from_lvb(struct inode *inode)
2136 ocfs2_unpack_timespec(&inode->i_ctime, 2104 ocfs2_unpack_timespec(&inode->i_ctime,
2137 be64_to_cpu(lvb->lvb_ictime_packed)); 2105 be64_to_cpu(lvb->lvb_ictime_packed));
2138 spin_unlock(&oi->ip_lock); 2106 spin_unlock(&oi->ip_lock);
2139
2140 mlog_exit_void();
2141} 2107}
2142 2108
2143static inline int ocfs2_meta_lvb_is_trustable(struct inode *inode, 2109static inline int ocfs2_meta_lvb_is_trustable(struct inode *inode,
@@ -2184,7 +2150,7 @@ refresh_check:
2184 2150
2185 status = 1; 2151 status = 1;
2186bail: 2152bail:
2187 mlog_exit(status); 2153 mlog(0, "status %d\n", status);
2188 return status; 2154 return status;
2189} 2155}
2190 2156
@@ -2202,8 +2168,6 @@ static inline void ocfs2_complete_lock_res_refresh(struct ocfs2_lock_res *lockre
2202 spin_unlock_irqrestore(&lockres->l_lock, flags); 2168 spin_unlock_irqrestore(&lockres->l_lock, flags);
2203 2169
2204 wake_up(&lockres->l_event); 2170 wake_up(&lockres->l_event);
2205
2206 mlog_exit_void();
2207} 2171}
2208 2172
2209/* may or may not return a bh if it went to disk. */ 2173/* may or may not return a bh if it went to disk. */
@@ -2284,7 +2248,6 @@ static int ocfs2_inode_lock_update(struct inode *inode,
2284bail_refresh: 2248bail_refresh:
2285 ocfs2_complete_lock_res_refresh(lockres, status); 2249 ocfs2_complete_lock_res_refresh(lockres, status);
2286bail: 2250bail:
2287 mlog_exit(status);
2288 return status; 2251 return status;
2289} 2252}
2290 2253
@@ -2419,7 +2382,6 @@ bail:
2419 if (local_bh) 2382 if (local_bh)
2420 brelse(local_bh); 2383 brelse(local_bh);
2421 2384
2422 mlog_exit(status);
2423 return status; 2385 return status;
2424} 2386}
2425 2387
@@ -2496,7 +2458,6 @@ int ocfs2_inode_lock_atime(struct inode *inode,
2496 } else 2458 } else
2497 *level = 0; 2459 *level = 0;
2498 2460
2499 mlog_exit(ret);
2500 return ret; 2461 return ret;
2501} 2462}
2502 2463
@@ -2514,8 +2475,6 @@ void ocfs2_inode_unlock(struct inode *inode,
2514 if (!ocfs2_is_hard_readonly(OCFS2_SB(inode->i_sb)) && 2475 if (!ocfs2_is_hard_readonly(OCFS2_SB(inode->i_sb)) &&
2515 !ocfs2_mount_local(osb)) 2476 !ocfs2_mount_local(osb))
2516 ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level); 2477 ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);
2517
2518 mlog_exit_void();
2519} 2478}
2520 2479
2521int ocfs2_orphan_scan_lock(struct ocfs2_super *osb, u32 *seqno) 2480int ocfs2_orphan_scan_lock(struct ocfs2_super *osb, u32 *seqno)
@@ -2597,7 +2556,6 @@ int ocfs2_super_lock(struct ocfs2_super *osb,
2597 ocfs2_track_lock_refresh(lockres); 2556 ocfs2_track_lock_refresh(lockres);
2598 } 2557 }
2599bail: 2558bail:
2600 mlog_exit(status);
2601 return status; 2559 return status;
2602} 2560}
2603 2561
@@ -3057,7 +3015,6 @@ bail:
3057 kthread_stop(osb->dc_task); 3015 kthread_stop(osb->dc_task);
3058 } 3016 }
3059 3017
3060 mlog_exit(status);
3061 return status; 3018 return status;
3062} 3019}
3063 3020
@@ -3086,8 +3043,6 @@ void ocfs2_dlm_shutdown(struct ocfs2_super *osb,
3086 osb->cconn = NULL; 3043 osb->cconn = NULL;
3087 3044
3088 ocfs2_dlm_shutdown_debug(osb); 3045 ocfs2_dlm_shutdown_debug(osb);
3089
3090 mlog_exit_void();
3091} 3046}
3092 3047
3093static int ocfs2_drop_lock(struct ocfs2_super *osb, 3048static int ocfs2_drop_lock(struct ocfs2_super *osb,
@@ -3169,7 +3124,6 @@ static int ocfs2_drop_lock(struct ocfs2_super *osb,
3169 3124
3170 ocfs2_wait_on_busy_lock(lockres); 3125 ocfs2_wait_on_busy_lock(lockres);
3171out: 3126out:
3172 mlog_exit(0);
3173 return 0; 3127 return 0;
3174} 3128}
3175 3129
@@ -3251,7 +3205,6 @@ int ocfs2_drop_inode_locks(struct inode *inode)
3251 if (err < 0 && !status) 3205 if (err < 0 && !status)
3252 status = err; 3206 status = err;
3253 3207
3254 mlog_exit(status);
3255 return status; 3208 return status;
3256} 3209}
3257 3210
@@ -3314,7 +3267,6 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb,
3314 3267
3315 ret = 0; 3268 ret = 0;
3316bail: 3269bail:
3317 mlog_exit(ret);
3318 return ret; 3270 return ret;
3319} 3271}
3320 3272
@@ -3362,7 +3314,6 @@ static int ocfs2_cancel_convert(struct ocfs2_super *osb,
3362 3314
3363 mlog(ML_BASTS, "lockres %s\n", lockres->l_name); 3315 mlog(ML_BASTS, "lockres %s\n", lockres->l_name);
3364 3316
3365 mlog_exit(ret);
3366 return ret; 3317 return ret;
3367} 3318}
3368 3319
@@ -3552,14 +3503,14 @@ downconvert:
3552 gen); 3503 gen);
3553 3504
3554leave: 3505leave:
3555 mlog_exit(ret); 3506 if (ret)
3507 mlog_errno(ret);
3556 return ret; 3508 return ret;
3557 3509
3558leave_requeue: 3510leave_requeue:
3559 spin_unlock_irqrestore(&lockres->l_lock, flags); 3511 spin_unlock_irqrestore(&lockres->l_lock, flags);
3560 ctl->requeue = 1; 3512 ctl->requeue = 1;
3561 3513
3562 mlog_exit(0);
3563 return 0; 3514 return 0;
3564} 3515}
3565 3516
@@ -3800,8 +3751,6 @@ static void ocfs2_set_qinfo_lvb(struct ocfs2_lock_res *lockres)
3800 lvb->lvb_blocks = cpu_to_be32(oinfo->dqi_gi.dqi_blocks); 3751 lvb->lvb_blocks = cpu_to_be32(oinfo->dqi_gi.dqi_blocks);
3801 lvb->lvb_free_blk = cpu_to_be32(oinfo->dqi_gi.dqi_free_blk); 3752 lvb->lvb_free_blk = cpu_to_be32(oinfo->dqi_gi.dqi_free_blk);
3802 lvb->lvb_free_entry = cpu_to_be32(oinfo->dqi_gi.dqi_free_entry); 3753 lvb->lvb_free_entry = cpu_to_be32(oinfo->dqi_gi.dqi_free_entry);
3803
3804 mlog_exit_void();
3805} 3754}
3806 3755
3807void ocfs2_qinfo_unlock(struct ocfs2_mem_dqinfo *oinfo, int ex) 3756void ocfs2_qinfo_unlock(struct ocfs2_mem_dqinfo *oinfo, int ex)
@@ -3812,7 +3761,6 @@ void ocfs2_qinfo_unlock(struct ocfs2_mem_dqinfo *oinfo, int ex)
3812 3761
3813 if (!ocfs2_is_hard_readonly(osb) && !ocfs2_mount_local(osb)) 3762 if (!ocfs2_is_hard_readonly(osb) && !ocfs2_mount_local(osb))
3814 ocfs2_cluster_unlock(osb, lockres, level); 3763 ocfs2_cluster_unlock(osb, lockres, level);
3815 mlog_exit_void();
3816} 3764}
3817 3765
3818static int ocfs2_refresh_qinfo(struct ocfs2_mem_dqinfo *oinfo) 3766static int ocfs2_refresh_qinfo(struct ocfs2_mem_dqinfo *oinfo)
@@ -3889,7 +3837,6 @@ int ocfs2_qinfo_lock(struct ocfs2_mem_dqinfo *oinfo, int ex)
3889 ocfs2_qinfo_unlock(oinfo, ex); 3837 ocfs2_qinfo_unlock(oinfo, ex);
3890 ocfs2_complete_lock_res_refresh(lockres, status); 3838 ocfs2_complete_lock_res_refresh(lockres, status);
3891bail: 3839bail:
3892 mlog_exit(status);
3893 return status; 3840 return status;
3894} 3841}
3895 3842
@@ -3968,8 +3915,6 @@ unqueue:
3968 if (ctl.unblock_action != UNBLOCK_CONTINUE 3915 if (ctl.unblock_action != UNBLOCK_CONTINUE
3969 && lockres->l_ops->post_unlock) 3916 && lockres->l_ops->post_unlock)
3970 lockres->l_ops->post_unlock(osb, lockres); 3917 lockres->l_ops->post_unlock(osb, lockres);
3971
3972 mlog_exit_void();
3973} 3918}
3974 3919
3975static void ocfs2_schedule_blocked_lock(struct ocfs2_super *osb, 3920static void ocfs2_schedule_blocked_lock(struct ocfs2_super *osb,
@@ -3995,8 +3940,6 @@ static void ocfs2_schedule_blocked_lock(struct ocfs2_super *osb,
3995 osb->blocked_lock_count++; 3940 osb->blocked_lock_count++;
3996 } 3941 }
3997 spin_unlock(&osb->dc_task_lock); 3942 spin_unlock(&osb->dc_task_lock);
3998
3999 mlog_exit_void();
4000} 3943}
4001 3944
4002static void ocfs2_downconvert_thread_do_work(struct ocfs2_super *osb) 3945static void ocfs2_downconvert_thread_do_work(struct ocfs2_super *osb)
@@ -4027,8 +3970,6 @@ static void ocfs2_downconvert_thread_do_work(struct ocfs2_super *osb)
4027 spin_lock(&osb->dc_task_lock); 3970 spin_lock(&osb->dc_task_lock);
4028 } 3971 }
4029 spin_unlock(&osb->dc_task_lock); 3972 spin_unlock(&osb->dc_task_lock);
4030
4031 mlog_exit_void();
4032} 3973}
4033 3974
4034static int ocfs2_downconvert_thread_lists_empty(struct ocfs2_super *osb) 3975static int ocfs2_downconvert_thread_lists_empty(struct ocfs2_super *osb)
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c
index b90c751ba938..96d7ed7f8305 100644
--- a/fs/ocfs2/export.c
+++ b/fs/ocfs2/export.c
@@ -141,7 +141,7 @@ check_gen:
141 mlog_errno(PTR_ERR(result)); 141 mlog_errno(PTR_ERR(result));
142 142
143bail: 143bail:
144 mlog_exit_ptr(result); 144 mlog(0, "result = %p\n", result);
145 return result; 145 return result;
146} 146}
147 147
@@ -178,7 +178,7 @@ bail_unlock:
178 ocfs2_inode_unlock(dir, 0); 178 ocfs2_inode_unlock(dir, 0);
179 179
180bail: 180bail:
181 mlog_exit_ptr(parent); 181 mlog(0, "parent %p\n", parent);
182 182
183 return parent; 183 return parent;
184} 184}
@@ -243,7 +243,7 @@ static int ocfs2_encode_fh(struct dentry *dentry, u32 *fh_in, int *max_len,
243 *max_len = len; 243 *max_len = len;
244 244
245bail: 245bail:
246 mlog_exit(type); 246 mlog(0, "type = %d\n", type);
247 return type; 247 return type;
248} 248}
249 249
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
index ed9916a9a271..7d74d176706a 100644
--- a/fs/ocfs2/extent_map.c
+++ b/fs/ocfs2/extent_map.c
@@ -897,7 +897,6 @@ int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr,
897 } 897 }
898 898
899out: 899out:
900 mlog_exit(rc);
901 return rc; 900 return rc;
902} 901}
903 902
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 71375d7b7bbe..1e1a93aa0526 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -135,7 +135,6 @@ static int ocfs2_file_open(struct inode *inode, struct file *file)
135 } 135 }
136 136
137leave: 137leave:
138 mlog_exit(status);
139 return status; 138 return status;
140} 139}
141 140
@@ -154,8 +153,6 @@ static int ocfs2_file_release(struct inode *inode, struct file *file)
154 153
155 ocfs2_free_file_private(inode, file); 154 ocfs2_free_file_private(inode, file);
156 155
157 mlog_exit(0);
158
159 return 0; 156 return 0;
160} 157}
161 158
@@ -195,7 +192,8 @@ static int ocfs2_sync_file(struct file *file, int datasync)
195 err = jbd2_journal_force_commit(journal); 192 err = jbd2_journal_force_commit(journal);
196 193
197bail: 194bail:
198 mlog_exit(err); 195 if (err)
196 mlog_errno(err);
199 197
200 return (err < 0) ? -EIO : 0; 198 return (err < 0) ? -EIO : 0;
201} 199}
@@ -278,7 +276,6 @@ int ocfs2_update_inode_atime(struct inode *inode,
278out_commit: 276out_commit:
279 ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle); 277 ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
280out: 278out:
281 mlog_exit(ret);
282 return ret; 279 return ret;
283} 280}
284 281
@@ -300,7 +297,6 @@ static int ocfs2_set_inode_size(handle_t *handle,
300 } 297 }
301 298
302bail: 299bail:
303 mlog_exit(status);
304 return status; 300 return status;
305} 301}
306 302
@@ -424,8 +420,6 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
424out_commit: 420out_commit:
425 ocfs2_commit_trans(osb, handle); 421 ocfs2_commit_trans(osb, handle);
426out: 422out:
427
428 mlog_exit(status);
429 return status; 423 return status;
430} 424}
431 425
@@ -520,7 +514,6 @@ bail:
520 if (!status && OCFS2_I(inode)->ip_clusters == 0) 514 if (!status && OCFS2_I(inode)->ip_clusters == 0)
521 status = ocfs2_try_remove_refcount_tree(inode, di_bh); 515 status = ocfs2_try_remove_refcount_tree(inode, di_bh);
522 516
523 mlog_exit(status);
524 return status; 517 return status;
525} 518}
526 519
@@ -713,7 +706,6 @@ leave:
713 brelse(bh); 706 brelse(bh);
714 bh = NULL; 707 bh = NULL;
715 708
716 mlog_exit(status);
717 return status; 709 return status;
718} 710}
719 711
@@ -1269,7 +1261,6 @@ bail:
1269 mlog_errno(status); 1261 mlog_errno(status);
1270 } 1262 }
1271 1263
1272 mlog_exit(status);
1273 return status; 1264 return status;
1274} 1265}
1275 1266
@@ -1295,8 +1286,6 @@ int ocfs2_getattr(struct vfsmount *mnt,
1295 stat->blksize = osb->s_clustersize; 1286 stat->blksize = osb->s_clustersize;
1296 1287
1297bail: 1288bail:
1298 mlog_exit(err);
1299
1300 return err; 1289 return err;
1301} 1290}
1302 1291
@@ -1318,7 +1307,6 @@ int ocfs2_permission(struct inode *inode, int mask, unsigned int flags)
1318 1307
1319 ocfs2_inode_unlock(inode, 0); 1308 ocfs2_inode_unlock(inode, 0);
1320out: 1309out:
1321 mlog_exit(ret);
1322 return ret; 1310 return ret;
1323} 1311}
1324 1312
@@ -1359,7 +1347,6 @@ static int __ocfs2_write_remove_suid(struct inode *inode,
1359out_trans: 1347out_trans:
1360 ocfs2_commit_trans(osb, handle); 1348 ocfs2_commit_trans(osb, handle);
1361out: 1349out:
1362 mlog_exit(ret);
1363 return ret; 1350 return ret;
1364} 1351}
1365 1352
@@ -2393,7 +2380,6 @@ out_sems:
2393 2380
2394 if (written) 2381 if (written)
2395 ret = written; 2382 ret = written;
2396 mlog_exit(ret);
2397 return ret; 2383 return ret;
2398} 2384}
2399 2385
@@ -2476,7 +2462,6 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe,
2476 balance_dirty_pages_ratelimited_nr(mapping, nr_pages); 2462 balance_dirty_pages_ratelimited_nr(mapping, nr_pages);
2477 } 2463 }
2478 2464
2479 mlog_exit(ret);
2480 return ret; 2465 return ret;
2481} 2466}
2482 2467
@@ -2507,7 +2492,6 @@ static ssize_t ocfs2_file_splice_read(struct file *in,
2507 ret = generic_file_splice_read(in, ppos, pipe, len, flags); 2492 ret = generic_file_splice_read(in, ppos, pipe, len, flags);
2508 2493
2509bail: 2494bail:
2510 mlog_exit(ret);
2511 return ret; 2495 return ret;
2512} 2496}
2513 2497
@@ -2588,7 +2572,6 @@ bail:
2588 } 2572 }
2589 if (rw_level != -1) 2573 if (rw_level != -1)
2590 ocfs2_rw_unlock(inode, rw_level); 2574 ocfs2_rw_unlock(inode, rw_level);
2591 mlog_exit(ret);
2592 2575
2593 return ret; 2576 return ret;
2594} 2577}
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 16ee8e96f731..a96e56f12728 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -172,7 +172,7 @@ bail:
172 if (!IS_ERR(inode)) { 172 if (!IS_ERR(inode)) {
173 mlog(0, "returning inode with number %llu\n", 173 mlog(0, "returning inode with number %llu\n",
174 (unsigned long long)OCFS2_I(inode)->ip_blkno); 174 (unsigned long long)OCFS2_I(inode)->ip_blkno);
175 mlog_exit_ptr(inode); 175 mlog(0, "inode %p\n", inode);
176 } 176 }
177 177
178 return inode; 178 return inode;
@@ -203,7 +203,6 @@ static int ocfs2_find_actor(struct inode *inode, void *opaque)
203 203
204 ret = 1; 204 ret = 1;
205bail: 205bail:
206 mlog_exit(ret);
207 return ret; 206 return ret;
208} 207}
209 208
@@ -235,7 +234,6 @@ static int ocfs2_init_locked_inode(struct inode *inode, void *opaque)
235 lockdep_set_class(&OCFS2_I(inode)->ip_alloc_sem, 234 lockdep_set_class(&OCFS2_I(inode)->ip_alloc_sem,
236 &ocfs2_file_ip_alloc_sem_key); 235 &ocfs2_file_ip_alloc_sem_key);
237 236
238 mlog_exit(0);
239 return 0; 237 return 0;
240} 238}
241 239
@@ -381,7 +379,6 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
381 if (S_ISDIR(inode->i_mode)) 379 if (S_ISDIR(inode->i_mode))
382 ocfs2_resv_set_type(&OCFS2_I(inode)->ip_la_data_resv, 380 ocfs2_resv_set_type(&OCFS2_I(inode)->ip_la_data_resv,
383 OCFS2_RESV_FLAG_DIR); 381 OCFS2_RESV_FLAG_DIR);
384 mlog_exit_void();
385} 382}
386 383
387static int ocfs2_read_locked_inode(struct inode *inode, 384static int ocfs2_read_locked_inode(struct inode *inode,
@@ -534,7 +531,6 @@ bail:
534 if (args && bh) 531 if (args && bh)
535 brelse(bh); 532 brelse(bh);
536 533
537 mlog_exit(status);
538 return status; 534 return status;
539} 535}
540 536
@@ -598,7 +594,6 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
598out: 594out:
599 if (handle) 595 if (handle)
600 ocfs2_commit_trans(osb, handle); 596 ocfs2_commit_trans(osb, handle);
601 mlog_exit(status);
602 return status; 597 return status;
603} 598}
604 599
@@ -1078,7 +1073,7 @@ bail_unlock_nfs_sync:
1078bail_unblock: 1073bail_unblock:
1079 ocfs2_unblock_signals(&oldset); 1074 ocfs2_unblock_signals(&oldset);
1080bail: 1075bail:
1081 mlog_exit_void(); 1076 return;
1082} 1077}
1083 1078
1084static void ocfs2_clear_inode(struct inode *inode) 1079static void ocfs2_clear_inode(struct inode *inode)
@@ -1177,8 +1172,6 @@ static void ocfs2_clear_inode(struct inode *inode)
1177 */ 1172 */
1178 jbd2_journal_release_jbd_inode(OCFS2_SB(inode->i_sb)->journal->j_journal, 1173 jbd2_journal_release_jbd_inode(OCFS2_SB(inode->i_sb)->journal->j_journal,
1179 &oi->ip_jinode); 1174 &oi->ip_jinode);
1180
1181 mlog_exit_void();
1182} 1175}
1183 1176
1184void ocfs2_evict_inode(struct inode *inode) 1177void ocfs2_evict_inode(struct inode *inode)
@@ -1208,7 +1201,6 @@ int ocfs2_drop_inode(struct inode *inode)
1208 else 1201 else
1209 res = generic_drop_inode(inode); 1202 res = generic_drop_inode(inode);
1210 1203
1211 mlog_exit_void();
1212 return res; 1204 return res;
1213} 1205}
1214 1206
@@ -1248,8 +1240,6 @@ int ocfs2_inode_revalidate(struct dentry *dentry)
1248 } 1240 }
1249 ocfs2_inode_unlock(inode, 0); 1241 ocfs2_inode_unlock(inode, 0);
1250bail: 1242bail:
1251 mlog_exit(status);
1252
1253 return status; 1243 return status;
1254} 1244}
1255 1245
@@ -1296,7 +1286,6 @@ int ocfs2_mark_inode_dirty(handle_t *handle,
1296 1286
1297 ocfs2_journal_dirty(handle, bh); 1287 ocfs2_journal_dirty(handle, bh);
1298leave: 1288leave:
1299 mlog_exit(status);
1300 return status; 1289 return status;
1301} 1290}
1302 1291
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c
index 7a4868196152..b4f51e94c8f5 100644
--- a/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
@@ -59,7 +59,6 @@ static int ocfs2_get_inode_attr(struct inode *inode, unsigned *flags)
59 *flags = OCFS2_I(inode)->ip_attr; 59 *flags = OCFS2_I(inode)->ip_attr;
60 ocfs2_inode_unlock(inode, 0); 60 ocfs2_inode_unlock(inode, 0);
61 61
62 mlog_exit(status);
63 return status; 62 return status;
64} 63}
65 64
@@ -125,7 +124,6 @@ bail:
125 124
126 brelse(bh); 125 brelse(bh);
127 126
128 mlog_exit(status);
129 return status; 127 return status;
130} 128}
131 129
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 7378277b17a4..956509167bf5 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -335,7 +335,6 @@ static int ocfs2_commit_cache(struct ocfs2_super *osb)
335 ocfs2_wake_downconvert_thread(osb); 335 ocfs2_wake_downconvert_thread(osb);
336 wake_up(&journal->j_checkpointed); 336 wake_up(&journal->j_checkpointed);
337finally: 337finally:
338 mlog_exit(status);
339 return status; 338 return status;
340} 339}
341 340
@@ -450,8 +449,6 @@ int ocfs2_extend_trans(handle_t *handle, int nblocks)
450 449
451 status = 0; 450 status = 0;
452bail: 451bail:
453
454 mlog_exit(status);
455 return status; 452 return status;
456} 453}
457 454
@@ -665,7 +662,6 @@ static int __ocfs2_journal_access(handle_t *handle,
665 mlog(ML_ERROR, "Error %d getting %d access to buffer!\n", 662 mlog(ML_ERROR, "Error %d getting %d access to buffer!\n",
666 status, type); 663 status, type);
667 664
668 mlog_exit(status);
669 return status; 665 return status;
670} 666}
671 667
@@ -739,8 +735,6 @@ void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh)
739 735
740 status = jbd2_journal_dirty_metadata(handle, bh); 736 status = jbd2_journal_dirty_metadata(handle, bh);
741 BUG_ON(status); 737 BUG_ON(status);
742
743 mlog_exit_void();
744} 738}
745 739
746#define OCFS2_DEFAULT_COMMIT_INTERVAL (HZ * JBD2_DEFAULT_MAX_COMMIT_AGE) 740#define OCFS2_DEFAULT_COMMIT_INTERVAL (HZ * JBD2_DEFAULT_MAX_COMMIT_AGE)
@@ -854,7 +848,6 @@ done:
854 } 848 }
855 } 849 }
856 850
857 mlog_exit(status);
858 return status; 851 return status;
859} 852}
860 853
@@ -899,7 +892,6 @@ static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb,
899 if (status < 0) 892 if (status < 0)
900 mlog_errno(status); 893 mlog_errno(status);
901 894
902 mlog_exit(status);
903 return status; 895 return status;
904} 896}
905 897
@@ -989,7 +981,6 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
989done: 981done:
990 if (inode) 982 if (inode)
991 iput(inode); 983 iput(inode);
992 mlog_exit_void();
993} 984}
994 985
995static void ocfs2_clear_journal_error(struct super_block *sb, 986static void ocfs2_clear_journal_error(struct super_block *sb,
@@ -1048,7 +1039,6 @@ int ocfs2_journal_load(struct ocfs2_journal *journal, int local, int replayed)
1048 osb->commit_task = NULL; 1039 osb->commit_task = NULL;
1049 1040
1050done: 1041done:
1051 mlog_exit(status);
1052 return status; 1042 return status;
1053} 1043}
1054 1044
@@ -1072,7 +1062,6 @@ int ocfs2_journal_wipe(struct ocfs2_journal *journal, int full)
1072 mlog_errno(status); 1062 mlog_errno(status);
1073 1063
1074bail: 1064bail:
1075 mlog_exit(status);
1076 return status; 1065 return status;
1077} 1066}
1078 1067
@@ -1146,7 +1135,6 @@ static int ocfs2_force_read_journal(struct inode *inode)
1146bail: 1135bail:
1147 for(i = 0; i < CONCURRENT_JOURNAL_FILL; i++) 1136 for(i = 0; i < CONCURRENT_JOURNAL_FILL; i++)
1148 brelse(bhs[i]); 1137 brelse(bhs[i]);
1149 mlog_exit(status);
1150 return status; 1138 return status;
1151} 1139}
1152 1140
@@ -1236,7 +1224,6 @@ void ocfs2_complete_recovery(struct work_struct *work)
1236 } 1224 }
1237 1225
1238 mlog(0, "Recovery completion\n"); 1226 mlog(0, "Recovery completion\n");
1239 mlog_exit_void();
1240} 1227}
1241 1228
1242/* NOTE: This function always eats your references to la_dinode and 1229/* NOTE: This function always eats your references to la_dinode and
@@ -1432,7 +1419,6 @@ bail:
1432 if (rm_quota) 1419 if (rm_quota)
1433 kfree(rm_quota); 1420 kfree(rm_quota);
1434 1421
1435 mlog_exit(status);
1436 /* no one is callint kthread_stop() for us so the kthread() api 1422 /* no one is callint kthread_stop() for us so the kthread() api
1437 * requires that we call do_exit(). And it isn't exported, but 1423 * requires that we call do_exit(). And it isn't exported, but
1438 * complete_and_exit() seems to be a minimal wrapper around it. */ 1424 * complete_and_exit() seems to be a minimal wrapper around it. */
@@ -1469,8 +1455,6 @@ void ocfs2_recovery_thread(struct ocfs2_super *osb, int node_num)
1469out: 1455out:
1470 mutex_unlock(&osb->recovery_lock); 1456 mutex_unlock(&osb->recovery_lock);
1471 wake_up(&osb->recovery_event); 1457 wake_up(&osb->recovery_event);
1472
1473 mlog_exit_void();
1474} 1458}
1475 1459
1476static int ocfs2_read_journal_inode(struct ocfs2_super *osb, 1460static int ocfs2_read_journal_inode(struct ocfs2_super *osb,
@@ -1646,7 +1630,6 @@ done:
1646 1630
1647 brelse(bh); 1631 brelse(bh);
1648 1632
1649 mlog_exit(status);
1650 return status; 1633 return status;
1651} 1634}
1652 1635
@@ -1716,7 +1699,6 @@ static int ocfs2_recover_node(struct ocfs2_super *osb,
1716 status = 0; 1699 status = 0;
1717done: 1700done:
1718 1701
1719 mlog_exit(status);
1720 return status; 1702 return status;
1721} 1703}
1722 1704
@@ -1826,7 +1808,6 @@ int ocfs2_mark_dead_nodes(struct ocfs2_super *osb)
1826 1808
1827 status = 0; 1809 status = 0;
1828bail: 1810bail:
1829 mlog_exit(status);
1830 return status; 1811 return status;
1831} 1812}
1832 1813
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index 5f08c703f354..36636e1c84e7 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -364,7 +364,8 @@ bail:
364 364
365 mlog(0, "Local alloc window bits = %d\n", osb->local_alloc_bits); 365 mlog(0, "Local alloc window bits = %d\n", osb->local_alloc_bits);
366 366
367 mlog_exit(status); 367 if (status)
368 mlog_errno(status);
368 return status; 369 return status;
369} 370}
370 371
@@ -478,8 +479,6 @@ out:
478 479
479 if (alloc_copy) 480 if (alloc_copy)
480 kfree(alloc_copy); 481 kfree(alloc_copy);
481
482 mlog_exit_void();
483} 482}
484 483
485/* 484/*
@@ -548,7 +547,8 @@ bail:
548 iput(inode); 547 iput(inode);
549 } 548 }
550 549
551 mlog_exit(status); 550 if (status)
551 mlog_errno(status);
552 return status; 552 return status;
553} 553}
554 554
@@ -614,7 +614,8 @@ out_mutex:
614out: 614out:
615 if (!status) 615 if (!status)
616 ocfs2_init_steal_slots(osb); 616 ocfs2_init_steal_slots(osb);
617 mlog_exit(status); 617 if (status)
618 mlog_errno(status);
618 return status; 619 return status;
619} 620}
620 621
@@ -724,7 +725,8 @@ bail:
724 mlog(0, "bits=%d, slot=%d, ret=%d\n", bits_wanted, osb->slot_num, 725 mlog(0, "bits=%d, slot=%d, ret=%d\n", bits_wanted, osb->slot_num,
725 status); 726 status);
726 727
727 mlog_exit(status); 728 if (status)
729 mlog_errno(status);
728 return status; 730 return status;
729} 731}
730 732
@@ -779,7 +781,8 @@ int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
779 ocfs2_journal_dirty(handle, osb->local_alloc_bh); 781 ocfs2_journal_dirty(handle, osb->local_alloc_bh);
780 782
781bail: 783bail:
782 mlog_exit(status); 784 if (status)
785 mlog_errno(status);
783 return status; 786 return status;
784} 787}
785 788
@@ -794,7 +797,7 @@ static u32 ocfs2_local_alloc_count_bits(struct ocfs2_dinode *alloc)
794 for (i = 0; i < le16_to_cpu(la->la_size); i++) 797 for (i = 0; i < le16_to_cpu(la->la_size); i++)
795 count += hweight8(buffer[i]); 798 count += hweight8(buffer[i]);
796 799
797 mlog_exit(count); 800 mlog(0, "count %u\n", count);
798 return count; 801 return count;
799} 802}
800 803
@@ -884,7 +887,7 @@ bail:
884 if (local_resv) 887 if (local_resv)
885 ocfs2_resv_discard(resmap, resv); 888 ocfs2_resv_discard(resmap, resv);
886 889
887 mlog_exit(bitoff); 890 mlog(0, "bitoff %d\n", bitoff);
888 return bitoff; 891 return bitoff;
889} 892}
890 893
@@ -898,8 +901,6 @@ static void ocfs2_clear_local_alloc(struct ocfs2_dinode *alloc)
898 la->la_bm_off = 0; 901 la->la_bm_off = 0;
899 for(i = 0; i < le16_to_cpu(la->la_size); i++) 902 for(i = 0; i < le16_to_cpu(la->la_size); i++)
900 la->la_bitmap[i] = 0; 903 la->la_bitmap[i] = 0;
901
902 mlog_exit_void();
903} 904}
904 905
905#if 0 906#if 0
@@ -995,7 +996,8 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
995 } 996 }
996 997
997bail: 998bail:
998 mlog_exit(status); 999 if (status)
1000 mlog_errno(status);
999 return status; 1001 return status;
1000} 1002}
1001 1003
@@ -1120,7 +1122,8 @@ bail:
1120 *ac = NULL; 1122 *ac = NULL;
1121 } 1123 }
1122 1124
1123 mlog_exit(status); 1125 if (status)
1126 mlog_errno(status);
1124 return status; 1127 return status;
1125} 1128}
1126 1129
@@ -1212,7 +1215,8 @@ retry_enospc:
1212 mlog(0, "window bits = %u\n", le32_to_cpu(alloc->id1.bitmap1.i_total)); 1215 mlog(0, "window bits = %u\n", le32_to_cpu(alloc->id1.bitmap1.i_total));
1213 1216
1214bail: 1217bail:
1215 mlog_exit(status); 1218 if (status)
1219 mlog_errno(status);
1216 return status; 1220 return status;
1217} 1221}
1218 1222
@@ -1308,7 +1312,8 @@ bail:
1308 if (ac) 1312 if (ac)
1309 ocfs2_free_alloc_context(ac); 1313 ocfs2_free_alloc_context(ac);
1310 1314
1311 mlog_exit(status); 1315 if (status)
1316 mlog_errno(status);
1312 return status; 1317 return status;
1313} 1318}
1314 1319
diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c
index 87438e178e11..49730b51ae45 100644
--- a/fs/ocfs2/mmap.c
+++ b/fs/ocfs2/mmap.c
@@ -55,7 +55,7 @@ static int ocfs2_fault(struct vm_area_struct *area, struct vm_fault *vmf)
55 ret = filemap_fault(area, vmf); 55 ret = filemap_fault(area, vmf);
56 ocfs2_unblock_signals(&oldset); 56 ocfs2_unblock_signals(&oldset);
57 57
58 mlog_exit_ptr(vmf->page); 58 mlog(0, "%p\n", vmf->page);
59 return ret; 59 return ret;
60} 60}
61 61
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index fdf5c0b75caa..8a13226eb1a2 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -182,7 +182,7 @@ bail_unlock:
182 182
183bail: 183bail:
184 184
185 mlog_exit_ptr(ret); 185 mlog(0, "%p\n", ret);
186 186
187 return ret; 187 return ret;
188} 188}
@@ -466,7 +466,8 @@ leave:
466 iput(inode); 466 iput(inode);
467 } 467 }
468 468
469 mlog_exit(status); 469 if (status)
470 mlog_errno(status);
470 471
471 return status; 472 return status;
472} 473}
@@ -577,7 +578,8 @@ leave:
577 } 578 }
578 } 579 }
579 580
580 mlog_exit(status); 581 if (status)
582 mlog_errno(status);
581 return status; 583 return status;
582} 584}
583 585
@@ -618,7 +620,8 @@ static int ocfs2_mkdir(struct inode *dir,
618 mlog(0, "(0x%p, 0x%p, %d, '%.*s')\n", dir, dentry, mode, 620 mlog(0, "(0x%p, 0x%p, %d, '%.*s')\n", dir, dentry, mode,
619 dentry->d_name.len, dentry->d_name.name); 621 dentry->d_name.len, dentry->d_name.name);
620 ret = ocfs2_mknod(dir, dentry, mode | S_IFDIR, 0); 622 ret = ocfs2_mknod(dir, dentry, mode | S_IFDIR, 0);
621 mlog_exit(ret); 623 if (ret)
624 mlog_errno(ret);
622 625
623 return ret; 626 return ret;
624} 627}
@@ -633,7 +636,8 @@ static int ocfs2_create(struct inode *dir,
633 mlog(0, "(0x%p, 0x%p, %d, '%.*s')\n", dir, dentry, mode, 636 mlog(0, "(0x%p, 0x%p, %d, '%.*s')\n", dir, dentry, mode,
634 dentry->d_name.len, dentry->d_name.name); 637 dentry->d_name.len, dentry->d_name.name);
635 ret = ocfs2_mknod(dir, dentry, mode | S_IFREG, 0); 638 ret = ocfs2_mknod(dir, dentry, mode | S_IFREG, 0);
636 mlog_exit(ret); 639 if (ret)
640 mlog_errno(ret);
637 641
638 return ret; 642 return ret;
639} 643}
@@ -757,7 +761,8 @@ out:
757 761
758 ocfs2_free_dir_lookup_result(&lookup); 762 ocfs2_free_dir_lookup_result(&lookup);
759 763
760 mlog_exit(err); 764 if (err)
765 mlog_errno(err);
761 766
762 return err; 767 return err;
763} 768}
@@ -954,7 +959,8 @@ leave:
954 ocfs2_free_dir_lookup_result(&orphan_insert); 959 ocfs2_free_dir_lookup_result(&orphan_insert);
955 ocfs2_free_dir_lookup_result(&lookup); 960 ocfs2_free_dir_lookup_result(&lookup);
956 961
957 mlog_exit(status); 962 if (status)
963 mlog_errno(status);
958 964
959 return status; 965 return status;
960} 966}
@@ -1025,7 +1031,8 @@ static int ocfs2_double_lock(struct ocfs2_super *osb,
1025 } 1031 }
1026 1032
1027bail: 1033bail:
1028 mlog_exit(status); 1034 if (status)
1035 mlog_errno(status);
1029 return status; 1036 return status;
1030} 1037}
1031 1038
@@ -1476,7 +1483,8 @@ bail:
1476 brelse(old_dir_bh); 1483 brelse(old_dir_bh);
1477 brelse(new_dir_bh); 1484 brelse(new_dir_bh);
1478 1485
1479 mlog_exit(status); 1486 if (status)
1487 mlog_errno(status);
1480 1488
1481 return status; 1489 return status;
1482} 1490}
@@ -1579,7 +1587,8 @@ bail:
1579 kfree(bhs); 1587 kfree(bhs);
1580 } 1588 }
1581 1589
1582 mlog_exit(status); 1590 if (status)
1591 mlog_errno(status);
1583 return status; 1592 return status;
1584} 1593}
1585 1594
@@ -1835,7 +1844,8 @@ bail:
1835 iput(inode); 1844 iput(inode);
1836 } 1845 }
1837 1846
1838 mlog_exit(status); 1847 if (status)
1848 mlog_errno(status);
1839 1849
1840 return status; 1850 return status;
1841} 1851}
@@ -1865,7 +1875,8 @@ static int ocfs2_blkno_stringify(u64 blkno, char *name)
1865 1875
1866 status = 0; 1876 status = 0;
1867bail: 1877bail:
1868 mlog_exit(status); 1878 if (status < 0)
1879 mlog_errno(status);
1869 return status; 1880 return status;
1870} 1881}
1871 1882
@@ -1978,7 +1989,8 @@ out:
1978 iput(orphan_dir_inode); 1989 iput(orphan_dir_inode);
1979 } 1990 }
1980 1991
1981 mlog_exit(ret); 1992 if (ret)
1993 mlog_errno(ret);
1982 return ret; 1994 return ret;
1983} 1995}
1984 1996
@@ -2060,7 +2072,8 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb,
2060leave: 2072leave:
2061 brelse(orphan_dir_bh); 2073 brelse(orphan_dir_bh);
2062 2074
2063 mlog_exit(status); 2075 if (status)
2076 mlog_errno(status);
2064 return status; 2077 return status;
2065} 2078}
2066 2079
@@ -2120,7 +2133,8 @@ int ocfs2_orphan_del(struct ocfs2_super *osb,
2120leave: 2133leave:
2121 ocfs2_free_dir_lookup_result(&lookup); 2134 ocfs2_free_dir_lookup_result(&lookup);
2122 2135
2123 mlog_exit(status); 2136 if (status)
2137 mlog_errno(status);
2124 return status; 2138 return status;
2125} 2139}
2126 2140
@@ -2472,7 +2486,8 @@ leave:
2472 2486
2473 ocfs2_free_dir_lookup_result(&lookup); 2487 ocfs2_free_dir_lookup_result(&lookup);
2474 2488
2475 mlog_exit(status); 2489 if (status)
2490 mlog_errno(status);
2476 2491
2477 return status; 2492 return status;
2478} 2493}
diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
index 33397bd7e1bc..10a49e8a5f03 100644
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -402,7 +402,8 @@ int ocfs2_global_read_info(struct super_block *sb, int type)
402 msecs_to_jiffies(oinfo->dqi_syncms)); 402 msecs_to_jiffies(oinfo->dqi_syncms));
403 403
404out_err: 404out_err:
405 mlog_exit(status); 405 if (status)
406 mlog_errno(status);
406 return status; 407 return status;
407out_unlock: 408out_unlock:
408 ocfs2_unlock_global_qf(oinfo, 0); 409 ocfs2_unlock_global_qf(oinfo, 0);
@@ -621,7 +622,6 @@ static int ocfs2_sync_dquot_helper(struct dquot *dquot, unsigned long type)
621out_ilock: 622out_ilock:
622 ocfs2_unlock_global_qf(oinfo, 1); 623 ocfs2_unlock_global_qf(oinfo, 1);
623out: 624out:
624 mlog_exit(status);
625 return status; 625 return status;
626} 626}
627 627
@@ -660,7 +660,6 @@ static int ocfs2_write_dquot(struct dquot *dquot)
660 mutex_unlock(&sb_dqopt(dquot->dq_sb)->dqio_mutex); 660 mutex_unlock(&sb_dqopt(dquot->dq_sb)->dqio_mutex);
661 ocfs2_commit_trans(osb, handle); 661 ocfs2_commit_trans(osb, handle);
662out: 662out:
663 mlog_exit(status);
664 return status; 663 return status;
665} 664}
666 665
@@ -722,7 +721,8 @@ out_ilock:
722 ocfs2_unlock_global_qf(oinfo, 1); 721 ocfs2_unlock_global_qf(oinfo, 1);
723out: 722out:
724 mutex_unlock(&dquot->dq_lock); 723 mutex_unlock(&dquot->dq_lock);
725 mlog_exit(status); 724 if (status)
725 mlog_errno(status);
726 return status; 726 return status;
727} 727}
728 728
@@ -809,7 +809,8 @@ out_dq:
809 set_bit(DQ_ACTIVE_B, &dquot->dq_flags); 809 set_bit(DQ_ACTIVE_B, &dquot->dq_flags);
810out: 810out:
811 mutex_unlock(&dquot->dq_lock); 811 mutex_unlock(&dquot->dq_lock);
812 mlog_exit(status); 812 if (status)
813 mlog_errno(status);
813 return status; 814 return status;
814} 815}
815 816
@@ -866,7 +867,8 @@ out_dlock:
866out_ilock: 867out_ilock:
867 ocfs2_unlock_global_qf(oinfo, 1); 868 ocfs2_unlock_global_qf(oinfo, 1);
868out: 869out:
869 mlog_exit(status); 870 if (status)
871 mlog_errno(status);
870 return status; 872 return status;
871} 873}
872 874
@@ -891,7 +893,8 @@ static int ocfs2_write_info(struct super_block *sb, int type)
891out_ilock: 893out_ilock:
892 ocfs2_unlock_global_qf(oinfo, 1); 894 ocfs2_unlock_global_qf(oinfo, 1);
893out: 895out:
894 mlog_exit(status); 896 if (status)
897 mlog_errno(status);
895 return status; 898 return status;
896} 899}
897 900
diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
index a71d68d88667..88ec4516637b 100644
--- a/fs/ocfs2/quota_local.c
+++ b/fs/ocfs2/quota_local.c
@@ -575,7 +575,8 @@ out_put_bh:
575 } 575 }
576 if (status < 0) 576 if (status < 0)
577 free_recovery_list(&(rec->r_list[type])); 577 free_recovery_list(&(rec->r_list[type]));
578 mlog_exit(status); 578 if (status)
579 mlog_errno(status);
579 return status; 580 return status;
580} 581}
581 582
diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c
index e4a50e3fcb80..76b37909a4a1 100644
--- a/fs/ocfs2/resize.c
+++ b/fs/ocfs2/resize.c
@@ -82,7 +82,6 @@ static u16 ocfs2_calc_new_backup_super(struct inode *inode,
82 backups++; 82 backups++;
83 } 83 }
84 84
85 mlog_exit_void();
86 return backups; 85 return backups;
87} 86}
88 87
@@ -176,7 +175,8 @@ out_rollback:
176 le16_add_cpu(&group->bg_free_bits_count, -1 * num_bits); 175 le16_add_cpu(&group->bg_free_bits_count, -1 * num_bits);
177 } 176 }
178out: 177out:
179 mlog_exit(ret); 178 if (ret)
179 mlog_errno(ret);
180 return ret; 180 return ret;
181} 181}
182 182
@@ -375,7 +375,6 @@ out_mutex:
375 iput(main_bm_inode); 375 iput(main_bm_inode);
376 376
377out: 377out:
378 mlog_exit_void();
379 return ret; 378 return ret;
380} 379}
381 380
@@ -585,6 +584,5 @@ out_mutex:
585 iput(main_bm_inode); 584 iput(main_bm_inode);
586 585
587out: 586out:
588 mlog_exit_void();
589 return ret; 587 return ret;
590} 588}
diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
index a6016e6b3ca2..93b449ed82f9 100644
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -510,7 +510,6 @@ int ocfs2_find_slot(struct ocfs2_super *osb)
510 mlog_errno(status); 510 mlog_errno(status);
511 511
512bail: 512bail:
513 mlog_exit(status);
514 return status; 513 return status;
515} 514}
516 515
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index dd618496c2c6..2d722f1fbaa0 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -434,7 +434,8 @@ static int ocfs2_block_group_fill(handle_t *handle,
434 * allocation time. */ 434 * allocation time. */
435 435
436bail: 436bail:
437 mlog_exit(status); 437 if (status)
438 mlog_errno(status);
438 return status; 439 return status;
439} 440}
440 441
@@ -792,7 +793,8 @@ bail:
792 793
793 brelse(bg_bh); 794 brelse(bg_bh);
794 795
795 mlog_exit(status); 796 if (status)
797 mlog_errno(status);
796 return status; 798 return status;
797} 799}
798 800
@@ -884,7 +886,8 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
884bail: 886bail:
885 brelse(bh); 887 brelse(bh);
886 888
887 mlog_exit(status); 889 if (status)
890 mlog_errno(status);
888 return status; 891 return status;
889} 892}
890 893
@@ -1046,7 +1049,8 @@ bail:
1046 *ac = NULL; 1049 *ac = NULL;
1047 } 1050 }
1048 1051
1049 mlog_exit(status); 1052 if (status)
1053 mlog_errno(status);
1050 return status; 1054 return status;
1051} 1055}
1052 1056
@@ -1146,7 +1150,8 @@ bail:
1146 *ac = NULL; 1150 *ac = NULL;
1147 } 1151 }
1148 1152
1149 mlog_exit(status); 1153 if (status)
1154 mlog_errno(status);
1150 return status; 1155 return status;
1151} 1156}
1152 1157
@@ -1221,7 +1226,8 @@ bail:
1221 *ac = NULL; 1226 *ac = NULL;
1222 } 1227 }
1223 1228
1224 mlog_exit(status); 1229 if (status)
1230 mlog_errno(status);
1225 return status; 1231 return status;
1226} 1232}
1227 1233
@@ -1384,7 +1390,8 @@ static inline int ocfs2_block_group_set_bits(handle_t *handle,
1384 ocfs2_journal_dirty(handle, group_bh); 1390 ocfs2_journal_dirty(handle, group_bh);
1385 1391
1386bail: 1392bail:
1387 mlog_exit(status); 1393 if (status)
1394 mlog_errno(status);
1388 return status; 1395 return status;
1389} 1396}
1390 1397
@@ -1474,7 +1481,8 @@ out_rollback:
1474 prev_bg->bg_next_group = cpu_to_le64(prev_bg_ptr); 1481 prev_bg->bg_next_group = cpu_to_le64(prev_bg_ptr);
1475 } 1482 }
1476 1483
1477 mlog_exit(status); 1484 if (status)
1485 mlog_errno(status);
1478 return status; 1486 return status;
1479} 1487}
1480 1488
@@ -1860,7 +1868,8 @@ bail:
1860 brelse(group_bh); 1868 brelse(group_bh);
1861 brelse(prev_group_bh); 1869 brelse(prev_group_bh);
1862 1870
1863 mlog_exit(status); 1871 if (status)
1872 mlog_errno(status);
1864 return status; 1873 return status;
1865} 1874}
1866 1875
@@ -1972,7 +1981,8 @@ set_hint:
1972 } 1981 }
1973 1982
1974bail: 1983bail:
1975 mlog_exit(status); 1984 if (status)
1985 mlog_errno(status);
1976 return status; 1986 return status;
1977} 1987}
1978 1988
@@ -2009,7 +2019,8 @@ int ocfs2_claim_metadata(handle_t *handle,
2009 *num_bits = res.sr_bits; 2019 *num_bits = res.sr_bits;
2010 status = 0; 2020 status = 0;
2011bail: 2021bail:
2012 mlog_exit(status); 2022 if (status)
2023 mlog_errno(status);
2013 return status; 2024 return status;
2014} 2025}
2015 2026
@@ -2216,7 +2227,8 @@ int ocfs2_claim_new_inode(handle_t *handle,
2216 ocfs2_save_inode_ac_group(dir, ac); 2227 ocfs2_save_inode_ac_group(dir, ac);
2217 status = 0; 2228 status = 0;
2218bail: 2229bail:
2219 mlog_exit(status); 2230 if (status)
2231 mlog_errno(status);
2220 return status; 2232 return status;
2221} 2233}
2222 2234
@@ -2347,7 +2359,8 @@ int __ocfs2_claim_clusters(handle_t *handle,
2347 ac->ac_bits_given += *num_clusters; 2359 ac->ac_bits_given += *num_clusters;
2348 2360
2349bail: 2361bail:
2350 mlog_exit(status); 2362 if (status)
2363 mlog_errno(status);
2351 return status; 2364 return status;
2352} 2365}
2353 2366
@@ -2491,7 +2504,8 @@ static int _ocfs2_free_suballoc_bits(handle_t *handle,
2491bail: 2504bail:
2492 brelse(group_bh); 2505 brelse(group_bh);
2493 2506
2494 mlog_exit(status); 2507 if (status)
2508 mlog_errno(status);
2495 return status; 2509 return status;
2496} 2510}
2497 2511
@@ -2563,7 +2577,8 @@ static int _ocfs2_free_clusters(handle_t *handle,
2563 num_clusters); 2577 num_clusters);
2564 2578
2565out: 2579out:
2566 mlog_exit(status); 2580 if (status)
2581 mlog_errno(status);
2567 return status; 2582 return status;
2568} 2583}
2569 2584
@@ -2770,7 +2785,8 @@ static int ocfs2_get_suballoc_slot_bit(struct ocfs2_super *osb, u64 blkno,
2770bail: 2785bail:
2771 brelse(inode_bh); 2786 brelse(inode_bh);
2772 2787
2773 mlog_exit(status); 2788 if (status)
2789 mlog_errno(status);
2774 return status; 2790 return status;
2775} 2791}
2776 2792
@@ -2821,7 +2837,8 @@ static int ocfs2_test_suballoc_bit(struct ocfs2_super *osb,
2821bail: 2837bail:
2822 brelse(group_bh); 2838 brelse(group_bh);
2823 2839
2824 mlog_exit(status); 2840 if (status)
2841 mlog_errno(status);
2825 return status; 2842 return status;
2826} 2843}
2827 2844
@@ -2887,6 +2904,7 @@ int ocfs2_test_inode_bit(struct ocfs2_super *osb, u64 blkno, int *res)
2887 iput(inode_alloc_inode); 2904 iput(inode_alloc_inode);
2888 brelse(alloc_bh); 2905 brelse(alloc_bh);
2889bail: 2906bail:
2890 mlog_exit(status); 2907 if (status)
2908 mlog_errno(status);
2891 return status; 2909 return status;
2892} 2910}
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 21c4bfdfd739..b21b702c5603 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -476,7 +476,8 @@ static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb)
476 } 476 }
477 477
478bail: 478bail:
479 mlog_exit(status); 479 if (status)
480 mlog_errno(status);
480 return status; 481 return status;
481} 482}
482 483
@@ -504,7 +505,8 @@ static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb)
504 } 505 }
505 506
506bail: 507bail:
507 mlog_exit(status); 508 if (status)
509 mlog_errno(status);
508 return status; 510 return status;
509} 511}
510 512
@@ -534,7 +536,7 @@ static void ocfs2_release_system_inodes(struct ocfs2_super *osb)
534 } 536 }
535 537
536 if (!osb->local_system_inodes) 538 if (!osb->local_system_inodes)
537 goto out; 539 return;
538 540
539 for (i = 0; i < NUM_LOCAL_SYSTEM_INODES * osb->max_slots; i++) { 541 for (i = 0; i < NUM_LOCAL_SYSTEM_INODES * osb->max_slots; i++) {
540 if (osb->local_system_inodes[i]) { 542 if (osb->local_system_inodes[i]) {
@@ -545,9 +547,6 @@ static void ocfs2_release_system_inodes(struct ocfs2_super *osb)
545 547
546 kfree(osb->local_system_inodes); 548 kfree(osb->local_system_inodes);
547 osb->local_system_inodes = NULL; 549 osb->local_system_inodes = NULL;
548
549out:
550 mlog_exit(0);
551} 550}
552 551
553/* We're allocating fs objects, use GFP_NOFS */ 552/* We're allocating fs objects, use GFP_NOFS */
@@ -1202,7 +1201,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
1202 mlog_errno(status); 1201 mlog_errno(status);
1203 atomic_set(&osb->vol_state, VOLUME_DISABLED); 1202 atomic_set(&osb->vol_state, VOLUME_DISABLED);
1204 wake_up(&osb->osb_mount_event); 1203 wake_up(&osb->osb_mount_event);
1205 mlog_exit(status);
1206 return status; 1204 return status;
1207 } 1205 }
1208 } 1206 }
@@ -1216,7 +1214,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
1216 /* Start this when the mount is almost sure of being successful */ 1214 /* Start this when the mount is almost sure of being successful */
1217 ocfs2_orphan_scan_start(osb); 1215 ocfs2_orphan_scan_start(osb);
1218 1216
1219 mlog_exit(status);
1220 return status; 1217 return status;
1221 1218
1222read_super_error: 1219read_super_error:
@@ -1231,7 +1228,8 @@ read_super_error:
1231 ocfs2_dismount_volume(sb, 1); 1228 ocfs2_dismount_volume(sb, 1);
1232 } 1229 }
1233 1230
1234 mlog_exit(status); 1231 if (status)
1232 mlog_errno(status);
1235 return status; 1233 return status;
1236} 1234}
1237 1235
@@ -1532,7 +1530,6 @@ static int ocfs2_parse_options(struct super_block *sb,
1532 status = 1; 1530 status = 1;
1533 1531
1534bail: 1532bail:
1535 mlog_exit(status);
1536 return status; 1533 return status;
1537} 1534}
1538 1535
@@ -1661,10 +1658,9 @@ leave:
1661 ocfs2_quota_shutdown(); 1658 ocfs2_quota_shutdown();
1662 ocfs2_free_mem_caches(); 1659 ocfs2_free_mem_caches();
1663 exit_ocfs2_uptodate_cache(); 1660 exit_ocfs2_uptodate_cache();
1661 mlog_errno(status);
1664 } 1662 }
1665 1663
1666 mlog_exit(status);
1667
1668 if (status >= 0) { 1664 if (status >= 0) {
1669 return register_filesystem(&ocfs2_fs_type); 1665 return register_filesystem(&ocfs2_fs_type);
1670 } else 1666 } else
@@ -1689,8 +1685,6 @@ static void __exit ocfs2_exit(void)
1689 unregister_filesystem(&ocfs2_fs_type); 1685 unregister_filesystem(&ocfs2_fs_type);
1690 1686
1691 exit_ocfs2_uptodate_cache(); 1687 exit_ocfs2_uptodate_cache();
1692
1693 mlog_exit_void();
1694} 1688}
1695 1689
1696static void ocfs2_put_super(struct super_block *sb) 1690static void ocfs2_put_super(struct super_block *sb)
@@ -1699,8 +1693,6 @@ static void ocfs2_put_super(struct super_block *sb)
1699 1693
1700 ocfs2_sync_blockdev(sb); 1694 ocfs2_sync_blockdev(sb);
1701 ocfs2_dismount_volume(sb, 0); 1695 ocfs2_dismount_volume(sb, 0);
1702
1703 mlog_exit_void();
1704} 1696}
1705 1697
1706static int ocfs2_statfs(struct dentry *dentry, struct kstatfs *buf) 1698static int ocfs2_statfs(struct dentry *dentry, struct kstatfs *buf)
@@ -1759,7 +1751,8 @@ bail:
1759 if (inode) 1751 if (inode)
1760 iput(inode); 1752 iput(inode);
1761 1753
1762 mlog_exit(status); 1754 if (status)
1755 mlog_errno(status);
1763 1756
1764 return status; 1757 return status;
1765} 1758}
@@ -1923,7 +1916,6 @@ leave:
1923 if (unlock_super) 1916 if (unlock_super)
1924 ocfs2_super_unlock(osb, 1); 1917 ocfs2_super_unlock(osb, 1);
1925 1918
1926 mlog_exit(status);
1927 return status; 1919 return status;
1928} 1920}
1929 1921
@@ -2373,7 +2365,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
2373 } 2365 }
2374 2366
2375bail: 2367bail:
2376 mlog_exit(status);
2377 return status; 2368 return status;
2378} 2369}
2379 2370
@@ -2443,7 +2434,8 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di,
2443 } 2434 }
2444 2435
2445out: 2436out:
2446 mlog_exit(status); 2437 if (status && status != -EAGAIN)
2438 mlog_errno(status);
2447 return status; 2439 return status;
2448} 2440}
2449 2441
@@ -2538,7 +2530,8 @@ finally:
2538 if (local_alloc) 2530 if (local_alloc)
2539 kfree(local_alloc); 2531 kfree(local_alloc);
2540 2532
2541 mlog_exit(status); 2533 if (status)
2534 mlog_errno(status);
2542 return status; 2535 return status;
2543} 2536}
2544 2537
@@ -2567,8 +2560,6 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb)
2567 kfree(osb->uuid_str); 2560 kfree(osb->uuid_str);
2568 ocfs2_put_dlm_debug(osb->osb_dlm_debug); 2561 ocfs2_put_dlm_debug(osb->osb_dlm_debug);
2569 memset(osb, 0, sizeof(struct ocfs2_super)); 2562 memset(osb, 0, sizeof(struct ocfs2_super));
2570
2571 mlog_exit_void();
2572} 2563}
2573 2564
2574/* Put OCFS2 into a readonly state, or (if the user specifies it), 2565/* Put OCFS2 into a readonly state, or (if the user specifies it),
diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
index 8a81688c57df..5485b19ec8f2 100644
--- a/fs/ocfs2/symlink.c
+++ b/fs/ocfs2/symlink.c
@@ -72,7 +72,6 @@ static char *ocfs2_fast_symlink_getlink(struct inode *inode,
72 fe = (struct ocfs2_dinode *) (*bh)->b_data; 72 fe = (struct ocfs2_dinode *) (*bh)->b_data;
73 link = (char *) fe->id2.i_symlink; 73 link = (char *) fe->id2.i_symlink;
74bail: 74bail:
75 mlog_exit(status);
76 75
77 return link; 76 return link;
78} 77}
@@ -100,7 +99,8 @@ static int ocfs2_readlink(struct dentry *dentry,
100 99
101 brelse(bh); 100 brelse(bh);
102out: 101out:
103 mlog_exit(ret); 102 if (ret < 0)
103 mlog_errno(ret);
104 return ret; 104 return ret;
105} 105}
106 106
@@ -136,7 +136,8 @@ bail:
136 nd_set_link(nd, status ? ERR_PTR(status) : link); 136 nd_set_link(nd, status ? ERR_PTR(status) : link);
137 brelse(bh); 137 brelse(bh);
138 138
139 mlog_exit(status); 139 if (status)
140 mlog_errno(status);
140 return NULL; 141 return NULL;
141} 142}
142 143
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 81f98b7f7502..d57c7942e4de 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -5570,7 +5570,6 @@ static int ocfs2_xattr_set_entry_bucket(struct inode *inode,
5570 5570
5571 5571
5572out: 5572out:
5573 mlog_exit(ret);
5574 return ret; 5573 return ret;
5575} 5574}
5576 5575
@@ -5637,7 +5636,6 @@ static int ocfs2_xattr_set_entry_index_block(struct inode *inode,
5637 mlog_errno(ret); 5636 mlog_errno(ret);
5638 5637
5639out: 5638out:
5640 mlog_exit(ret);
5641 return ret; 5639 return ret;
5642} 5640}
5643 5641
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-29 09:49:34 -0500