Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d29c0afe authored by Fabian Frederick's avatar Fabian Frederick Committed by Steven Whitehouse
Browse files

GFS2: use _RET_IP_ instead of (unsigned long)__builtin_return_address(0) 



use macro definition

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent d24e0569

fs/gfs2/glock.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -811,7 +811,7 @@ void gfs2_holder_init(struct gfs2_glock *gl, unsigned int state, unsigned flags, 
{

{

	INIT_LIST_HEAD(&gh->gh_list);

	INIT_LIST_HEAD(&gh->gh_list);

	gh->gh_gl = gl;

	gh->gh_gl = gl;

	gh->gh_ip = (unsigned long)__builtin_return_address(0);

	gh->gh_ip = _RET_IP_;

	gh->gh_owner_pid = get_pid(task_pid(current));

	gh->gh_owner_pid = get_pid(task_pid(current));

	gh->gh_state = state;

	gh->gh_state = state;

	gh->gh_flags = flags;

	gh->gh_flags = flags;
@@ -835,7 +835,7 @@ void gfs2_holder_reinit(unsigned int state, unsigned flags, struct gfs2_holder * 
	gh->gh_state = state;

	gh->gh_state = state;

	gh->gh_flags = flags;

	gh->gh_flags = flags;

	gh->gh_iflags = 0;

	gh->gh_iflags = 0;

	gh->gh_ip = (unsigned long)__builtin_return_address(0);

	gh->gh_ip = _RET_IP_;

	if (gh->gh_owner_pid)

	if (gh->gh_owner_pid)

		put_pid(gh->gh_owner_pid);

		put_pid(gh->gh_owner_pid);

	gh->gh_owner_pid = get_pid(task_pid(current));

	gh->gh_owner_pid = get_pid(task_pid(current));

fs/gfs2/glops.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl) 
         * tr->alloced is not set since the transaction structure is

         * tr->alloced is not set since the transaction structure is

         * on the stack */

         * on the stack */

	tr.tr_reserved = 1 + gfs2_struct2blk(sdp, tr.tr_revokes, sizeof(u64));

	tr.tr_reserved = 1 + gfs2_struct2blk(sdp, tr.tr_revokes, sizeof(u64));

	tr.tr_ip = (unsigned long)__builtin_return_address(0);

	tr.tr_ip = _RET_IP_;

	sb_start_intwrite(sdp->sd_vfs);

	sb_start_intwrite(sdp->sd_vfs);

	if (gfs2_log_reserve(sdp, tr.tr_reserved) < 0) {

	if (gfs2_log_reserve(sdp, tr.tr_reserved) < 0) {

		sb_end_intwrite(sdp->sd_vfs);

		sb_end_intwrite(sdp->sd_vfs);

fs/gfs2/trans.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks, 
	if (!tr)

	if (!tr)

		return -ENOMEM;

		return -ENOMEM;





	tr->tr_ip = (unsigned long)__builtin_return_address(0);

	tr->tr_ip = _RET_IP_;

	tr->tr_blocks = blocks;

	tr->tr_blocks = blocks;

	tr->tr_revokes = revokes;

	tr->tr_revokes = revokes;

	tr->tr_reserved = 1;

	tr->tr_reserved = 1;