diff options
author | Bob Peterson <rpeterso@redhat.com> | 2012-10-24 14:41:05 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-11-07 08:31:57 -0500 |
commit | 06dfc30641370094ed522bf5949b2a326fe2741b (patch) | |
tree | c05791330b321fd81c8dbf35aec1fbe864f53424 /fs/gfs2 | |
parent | a68a0a352a0209467268dfddffe02db08b97ddb4 (diff) |
GFS2: Rename glops go_xmote_th to go_sync
[Editorial: This is a nit, but has been a minor irritation for a long time:]
This patch renames glops structure item for go_xmote_th to go_sync.
The functionality is unchanged; it's just for readability.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/glock.c | 4 | ||||
-rw-r--r-- | fs/gfs2/glops.c | 6 | ||||
-rw-r--r-- | fs/gfs2/incore.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index e543871ec82..6114571a979 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
@@ -535,8 +535,8 @@ __acquires(&gl->gl_spin) | |||
535 | (lck_flags & (LM_FLAG_TRY|LM_FLAG_TRY_1CB))) | 535 | (lck_flags & (LM_FLAG_TRY|LM_FLAG_TRY_1CB))) |
536 | clear_bit(GLF_BLOCKING, &gl->gl_flags); | 536 | clear_bit(GLF_BLOCKING, &gl->gl_flags); |
537 | spin_unlock(&gl->gl_spin); | 537 | spin_unlock(&gl->gl_spin); |
538 | if (glops->go_xmote_th) | 538 | if (glops->go_sync) |
539 | glops->go_xmote_th(gl); | 539 | glops->go_sync(gl); |
540 | if (test_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags)) | 540 | if (test_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags)) |
541 | glops->go_inval(gl, target == LM_ST_DEFERRED ? 0 : DIO_METADATA); | 541 | glops->go_inval(gl, target == LM_ST_DEFERRED ? 0 : DIO_METADATA); |
542 | clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags); | 542 | clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags); |
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 0a3e7c7e26c..e86fe26c12d 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c | |||
@@ -536,7 +536,7 @@ const struct gfs2_glock_operations gfs2_meta_glops = { | |||
536 | }; | 536 | }; |
537 | 537 | ||
538 | const struct gfs2_glock_operations gfs2_inode_glops = { | 538 | const struct gfs2_glock_operations gfs2_inode_glops = { |
539 | .go_xmote_th = inode_go_sync, | 539 | .go_sync = inode_go_sync, |
540 | .go_inval = inode_go_inval, | 540 | .go_inval = inode_go_inval, |
541 | .go_demote_ok = inode_go_demote_ok, | 541 | .go_demote_ok = inode_go_demote_ok, |
542 | .go_lock = inode_go_lock, | 542 | .go_lock = inode_go_lock, |
@@ -546,7 +546,7 @@ const struct gfs2_glock_operations gfs2_inode_glops = { | |||
546 | }; | 546 | }; |
547 | 547 | ||
548 | const struct gfs2_glock_operations gfs2_rgrp_glops = { | 548 | const struct gfs2_glock_operations gfs2_rgrp_glops = { |
549 | .go_xmote_th = rgrp_go_sync, | 549 | .go_sync = rgrp_go_sync, |
550 | .go_inval = rgrp_go_inval, | 550 | .go_inval = rgrp_go_inval, |
551 | .go_lock = gfs2_rgrp_go_lock, | 551 | .go_lock = gfs2_rgrp_go_lock, |
552 | .go_unlock = gfs2_rgrp_go_unlock, | 552 | .go_unlock = gfs2_rgrp_go_unlock, |
@@ -556,7 +556,7 @@ const struct gfs2_glock_operations gfs2_rgrp_glops = { | |||
556 | }; | 556 | }; |
557 | 557 | ||
558 | const struct gfs2_glock_operations gfs2_trans_glops = { | 558 | const struct gfs2_glock_operations gfs2_trans_glops = { |
559 | .go_xmote_th = trans_go_sync, | 559 | .go_sync = trans_go_sync, |
560 | .go_xmote_bh = trans_go_xmote_bh, | 560 | .go_xmote_bh = trans_go_xmote_bh, |
561 | .go_demote_ok = trans_go_demote_ok, | 561 | .go_demote_ok = trans_go_demote_ok, |
562 | .go_type = LM_TYPE_NONDISK, | 562 | .go_type = LM_TYPE_NONDISK, |
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 24bb0b85786..a46f0348593 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h | |||
@@ -205,7 +205,7 @@ struct lm_lockname { | |||
205 | 205 | ||
206 | 206 | ||
207 | struct gfs2_glock_operations { | 207 | struct gfs2_glock_operations { |
208 | void (*go_xmote_th) (struct gfs2_glock *gl); | 208 | void (*go_sync) (struct gfs2_glock *gl); |
209 | int (*go_xmote_bh) (struct gfs2_glock *gl, struct gfs2_holder *gh); | 209 | int (*go_xmote_bh) (struct gfs2_glock *gl, struct gfs2_holder *gh); |
210 | void (*go_inval) (struct gfs2_glock *gl, int flags); | 210 | void (*go_inval) (struct gfs2_glock *gl, int flags); |
211 | int (*go_demote_ok) (const struct gfs2_glock *gl); | 211 | int (*go_demote_ok) (const struct gfs2_glock *gl); |