Merge tag 'gfs2-v6.6-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / gfs2 / glops.c

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index e7d334c..b41c78b 100644 (file)
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -614,18 +614,6 @@ static int freeze_go_xmote_bh(struct gfs2_glock *gl)
        return 0;
 }
 
-/**
- * freeze_go_demote_ok
- * @gl: the glock
- *
- * Always returns 0
- */
-
-static int freeze_go_demote_ok(const struct gfs2_glock *gl)
-{
-       return 0;
-}
-
 /**
  * iopen_go_callback - schedule the dcache entry for the inode to be deleted
  * @gl: the glock
@@ -745,7 +733,6 @@ const struct gfs2_glock_operations gfs2_rgrp_glops = {
 
 const struct gfs2_glock_operations gfs2_freeze_glops = {
        .go_xmote_bh = freeze_go_xmote_bh,
-       .go_demote_ok = freeze_go_demote_ok,
        .go_callback = freeze_go_callback,
        .go_type = LM_TYPE_NONDISK,
        .go_flags = GLOF_NONDISK,