diff options
| author | Tao Ma <boyu.mt@taobao.com> | 2011-03-07 16:43:21 +0800 | 
|---|---|---|
| committer | Tao Ma <boyu.mt@taobao.com> | 2011-03-07 16:43:21 +0800 | 
| commit | c1e8d35ef5ffb393b94a192034b5e3541e005d75 (patch) | |
| tree | b9a7f089acd3408c2835a3dfd6aa7bb0407587b3 /fs/ocfs2/dir.c | |
| parent | ef6b689b63b9f5227ccee6f16dd9ee3faf58a464 (diff) | |
| download | olio-linux-3.10-c1e8d35ef5ffb393b94a192034b5e3541e005d75.tar.xz olio-linux-3.10-c1e8d35ef5ffb393b94a192034b5e3541e005d75.zip  | |
ocfs2: Remove EXIT from masklog.
mlog_exit is used to record the exit status of a function.
But because it is added in so many functions, if we enable it,
the system logs get filled up quickly and cause too much I/O.
So actually no one can open it for a production system or even
for a test.
This patch just try to remove it or change it. So:
1. if all the error paths already use mlog_errno, it is just removed.
   Otherwise, it will be replaced by mlog_errno.
2. if it is used to print some return value, it is replaced with
   mlog(0,...).
mlog_exit_ptr is changed to mlog(0.
All those mlog(0,...) will be replaced with trace events later.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Diffstat (limited to 'fs/ocfs2/dir.c')
| -rw-r--r-- | fs/ocfs2/dir.c | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 2c983f083f8..2fc6c3673be 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,  	}  bail: -	mlog_exit(ret); +	mlog(0, "ret = %d\n", ret);  	return ret;  } @@ -784,7 +784,7 @@ cleanup_and_exit:  	for (; ra_ptr < ra_max; ra_ptr++)  		brelse(bh_use[ra_ptr]); -	mlog_exit_ptr(ret); +	mlog(0, "ret = %p\n", ret);  	return ret;  } @@ -1198,7 +1198,6 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir,  		de = (struct ocfs2_dir_entry *)((char *)de + le16_to_cpu(de->rec_len));  	}  bail: -	mlog_exit(status);  	return status;  } @@ -1759,8 +1758,9 @@ int __ocfs2_add_entry(handle_t *handle,  	 * from ever getting here. */  	retval = -ENOSPC;  bail: +	if (retval) +		mlog_errno(retval); -	mlog_exit(retval);  	return retval;  } @@ -2045,9 +2045,10 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)  				      dirent, filldir, NULL);  	ocfs2_inode_unlock(inode, lock_level); +	if (error) +		mlog_errno(error);  bail_nolock: -	mlog_exit(error);  	return error;  } @@ -2119,7 +2120,8 @@ int ocfs2_check_dir_for_entry(struct inode *dir,  bail:  	ocfs2_free_dir_lookup_result(&lookup); -	mlog_exit(ret); +	if (ret) +		mlog_errno(ret);  	return ret;  } @@ -2372,7 +2374,6 @@ static int ocfs2_fill_new_dir_el(struct ocfs2_super *osb,  bail:  	brelse(new_bh); -	mlog_exit(status);  	return status;  } @@ -3227,7 +3228,6 @@ static int ocfs2_do_extend_dir(struct super_block *sb,  bail:  	if (did_quota && status < 0)  		dquot_free_space_nodirty(dir, ocfs2_clusters_to_bytes(sb, 1)); -	mlog_exit(status);  	return status;  } @@ -3426,7 +3426,6 @@ bail:  	brelse(new_bh); -	mlog_exit(status);  	return status;  } @@ -3573,8 +3572,9 @@ next:  	status = 0;  bail:  	brelse(bh); +	if (status) +		mlog_errno(status); -	mlog_exit(status);  	return status;  }  |