@@ -61,8 +61,8 @@ struct gfs2_glock_iter {
6161typedef void (* glock_examiner ) (struct gfs2_glock * gl );
6262
6363static void do_xmote (struct gfs2_glock * gl , struct gfs2_holder * gh , unsigned int target );
64- static void handle_callback (struct gfs2_glock * gl , unsigned int state ,
65- unsigned long delay , bool remote );
64+ static void request_demote (struct gfs2_glock * gl , unsigned int state ,
65+ unsigned long delay , bool remote );
6666
6767static struct dentry * gfs2_root ;
6868static struct workqueue_struct * glock_workqueue ;
@@ -811,7 +811,7 @@ __acquires(&gl->gl_lockref.lock)
811811 (target != LM_ST_UNLOCKED ||
812812 test_bit (SDF_WITHDRAW_RECOVERY , & sdp -> sd_flags ))) {
813813 if (!is_system_glock (gl )) {
814- handle_callback (gl , LM_ST_UNLOCKED , 0 , false); /* sets demote */
814+ request_demote (gl , LM_ST_UNLOCKED , 0 , false);
815815 /*
816816 * Ordinarily, we would call dlm and its callback would call
817817 * finish_xmote, which would call state_change() to the new state.
@@ -1459,7 +1459,7 @@ int gfs2_glock_async_wait(unsigned int num_gh, struct gfs2_holder *ghs)
14591459}
14601460
14611461/**
1462- * handle_callback - process a demote request
1462+ * request_demote - process a demote request
14631463 * @gl: the glock
14641464 * @state: the state the caller wants us to change to
14651465 * @delay: zero to demote immediately; otherwise pending demote
@@ -1469,8 +1469,8 @@ int gfs2_glock_async_wait(unsigned int num_gh, struct gfs2_holder *ghs)
14691469 * practise: LM_ST_SHARED and LM_ST_UNLOCKED
14701470 */
14711471
1472- static void handle_callback (struct gfs2_glock * gl , unsigned int state ,
1473- unsigned long delay , bool remote )
1472+ static void request_demote (struct gfs2_glock * gl , unsigned int state ,
1473+ unsigned long delay , bool remote )
14741474{
14751475 if (delay )
14761476 set_bit (GLF_PENDING_DEMOTE , & gl -> gl_flags );
@@ -1686,7 +1686,7 @@ static void __gfs2_glock_dq(struct gfs2_holder *gh)
16861686 * below.
16871687 */
16881688 if (gh -> gh_flags & GL_NOCACHE )
1689- handle_callback (gl , LM_ST_UNLOCKED , 0 , false);
1689+ request_demote (gl , LM_ST_UNLOCKED , 0 , false);
16901690
16911691 list_del_init (& gh -> gh_list );
16921692 clear_bit (HIF_HOLDER , & gh -> gh_iflags );
@@ -1933,7 +1933,7 @@ void gfs2_glock_cb(struct gfs2_glock *gl, unsigned int state)
19331933 if (test_bit (GLF_HAVE_REPLY , & gl -> gl_flags ))
19341934 delay = gl -> gl_hold_time ;
19351935 }
1936- handle_callback (gl , state , delay , true);
1936+ request_demote (gl , state , delay , true);
19371937 gfs2_glock_queue_work (gl , delay );
19381938 spin_unlock (& gl -> gl_lockref .lock );
19391939}
@@ -2062,7 +2062,7 @@ __acquires(&lru_lock)
20622062 freed ++ ;
20632063 gl -> gl_lockref .count ++ ;
20642064 if (demote_ok (gl ))
2065- handle_callback (gl , LM_ST_UNLOCKED , 0 , false);
2065+ request_demote (gl , LM_ST_UNLOCKED , 0 , false);
20662066 gfs2_glock_queue_work (gl , 0 );
20672067 spin_unlock (& gl -> gl_lockref .lock );
20682068 cond_resched_lock (& lru_lock );
@@ -2205,7 +2205,7 @@ static void clear_glock(struct gfs2_glock *gl)
22052205 if (!__lockref_is_dead (& gl -> gl_lockref )) {
22062206 gl -> gl_lockref .count ++ ;
22072207 if (gl -> gl_state != LM_ST_UNLOCKED )
2208- handle_callback (gl , LM_ST_UNLOCKED , 0 , false);
2208+ request_demote (gl , LM_ST_UNLOCKED , 0 , false);
22092209 gfs2_glock_queue_work (gl , 0 );
22102210 }
22112211 spin_unlock (& gl -> gl_lockref .lock );
0 commit comments