Skip to content

Commit 8e5107c

Browse files
committed
gfs2: remove redundant warnings
jira NONE_AUTOMATION Rebuild_History Non-Buildable kernel-5.14.0-570.12.1.el9_6 commit-author Andreas Gruenbacher <[email protected]> commit 79fe790 In glock_set_object() and glock_clear_object(), there is no need to print the glock type and number when we dump the entire glock, anyway. Signed-off-by: Andreas Gruenbacher <[email protected]> (cherry picked from commit 79fe790) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 7ef3f5e commit 8e5107c

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

fs/gfs2/glock.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -910,12 +910,8 @@ void glock_set_object(struct gfs2_glock *gl, void *object)
910910
prev_object = gl->gl_object;
911911
gl->gl_object = object;
912912
spin_unlock(&gl->gl_lockref.lock);
913-
if (gfs2_assert_warn(gl->gl_name.ln_sbd, prev_object == NULL)) {
914-
pr_warn("glock=%u/%llx\n",
915-
gl->gl_name.ln_type,
916-
(unsigned long long)gl->gl_name.ln_number);
913+
if (gfs2_assert_warn(gl->gl_name.ln_sbd, prev_object == NULL))
917914
gfs2_dump_glock(NULL, gl, true);
918-
}
919915
}
920916

921917
/**
@@ -931,12 +927,8 @@ void glock_clear_object(struct gfs2_glock *gl, void *object)
931927
prev_object = gl->gl_object;
932928
gl->gl_object = NULL;
933929
spin_unlock(&gl->gl_lockref.lock);
934-
if (gfs2_assert_warn(gl->gl_name.ln_sbd, prev_object == object)) {
935-
pr_warn("glock=%u/%llx\n",
936-
gl->gl_name.ln_type,
937-
(unsigned long long)gl->gl_name.ln_number);
930+
if (gfs2_assert_warn(gl->gl_name.ln_sbd, prev_object == object))
938931
gfs2_dump_glock(NULL, gl, true);
939-
}
940932
}
941933

942934
void gfs2_inode_remember_delete(struct gfs2_glock *gl, u64 generation)

0 commit comments

Comments
 (0)