forked from Minki/linux
GFS2: use _RET_IP_ instead of (unsigned long)__builtin_return_address(0)
use macro definition Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
d24e0569e0
commit
d29c0afe4d
@ -811,7 +811,7 @@ void gfs2_holder_init(struct gfs2_glock *gl, unsigned int state, unsigned flags,
|
||||
{
|
||||
INIT_LIST_HEAD(&gh->gh_list);
|
||||
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_state = state;
|
||||
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_flags = flags;
|
||||
gh->gh_iflags = 0;
|
||||
gh->gh_ip = (unsigned long)__builtin_return_address(0);
|
||||
gh->gh_ip = _RET_IP_;
|
||||
if (gh->gh_owner_pid)
|
||||
put_pid(gh->gh_owner_pid);
|
||||
gh->gh_owner_pid = get_pid(task_pid(current));
|
||||
|
@ -93,7 +93,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl)
|
||||
* tr->alloced is not set since the transaction structure is
|
||||
* on the stack */
|
||||
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);
|
||||
if (gfs2_log_reserve(sdp, tr.tr_reserved) < 0) {
|
||||
sb_end_intwrite(sdp->sd_vfs);
|
||||
|
@ -44,7 +44,7 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
|
||||
if (!tr)
|
||||
return -ENOMEM;
|
||||
|
||||
tr->tr_ip = (unsigned long)__builtin_return_address(0);
|
||||
tr->tr_ip = _RET_IP_;
|
||||
tr->tr_blocks = blocks;
|
||||
tr->tr_revokes = revokes;
|
||||
tr->tr_reserved = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user