gfs2: Rename gfs2_freeze_lock{ => _shared }

Rename gfs2_freeze_lock to gfs2_freeze_lock_shared to make it a bit more
obvious that this function establishes the "thawed" state of the freeze
glock.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 3b93e4a22dfddbd6fd46fd7ea17d3de39e8a879f..4fb25496e92f9f87af48f18b125d6ff30f5a4fdd 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1269,7 +1269,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
                }
        }
 
-       error = gfs2_freeze_lock(sdp, &freeze_gh, 0);
+       error = gfs2_freeze_lock_shared(sdp, &freeze_gh, 0);
        if (error)
                goto fail_per_node;
 
@@ -1592,7 +1592,7 @@ static int gfs2_reconfigure(struct fs_context *fc)
        if ((sb->s_flags ^ fc->sb_flags) & SB_RDONLY) {
                struct gfs2_holder freeze_gh;
 
-               error = gfs2_freeze_lock(sdp, &freeze_gh, 0);
+               error = gfs2_freeze_lock_shared(sdp, &freeze_gh, 0);
                if (error)
                        return -EINVAL;
 

diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index d8e522f389aa7c652bd3112c6147c1bb58969943..61ef07da40b22fac2d18d221e2cbfb0fd62f5323 100644 (file)
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -470,7 +470,7 @@ void gfs2_recover_func(struct work_struct *work)
 
                /* Acquire a shared hold on the freeze glock */
 
-               error = gfs2_freeze_lock(sdp, &thaw_gh, LM_FLAG_PRIORITY);
+               error = gfs2_freeze_lock_shared(sdp, &thaw_gh, LM_FLAG_PRIORITY);
                if (error)
                        goto fail_gunlock_ji;
 

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index bfaeef04a4f7288b212f7a21d15fe92ecb7d3a1d..01ea53504e9d43928a18ee27184fcf4ce8725ecf 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -677,7 +677,7 @@ void gfs2_freeze_func(struct work_struct *work)
        struct super_block *sb = sdp->sd_vfs;
 
        atomic_inc(&sb->s_active);
-       error = gfs2_freeze_lock(sdp, &freeze_gh, 0);
+       error = gfs2_freeze_lock_shared(sdp, &freeze_gh, 0);
        if (error) {
                gfs2_assert_withdraw(sdp, 0);
        } else {

diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index 16ac3b3e7b885e6457e7ea32c27cfbe4d1ba8b01..817c4f42ae7b44c544cb473b886f3b1f94d09ec9 100644 (file)
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -93,13 +93,13 @@ out_unlock:
 }
 
 /**
- * gfs2_freeze_lock - hold the freeze glock
+ * gfs2_freeze_lock_shared - hold the freeze glock
  * @sdp: the superblock
  * @freeze_gh: pointer to the requested holder
  * @caller_flags: any additional flags needed by the caller
  */
-int gfs2_freeze_lock(struct gfs2_sbd *sdp, struct gfs2_holder *freeze_gh,
-                    int caller_flags)
+int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp, struct gfs2_holder *freeze_gh,
+                           int caller_flags)
 {
        int flags = LM_FLAG_NOEXP | GL_EXACT | caller_flags;
        int error;
@@ -157,8 +157,8 @@ static void signal_our_withdraw(struct gfs2_sbd *sdp)
                gfs2_holder_mark_uninitialized(&freeze_gh);
                if (sdp->sd_freeze_gl &&
                    !gfs2_glock_is_locked_by_me(sdp->sd_freeze_gl)) {
-                       ret = gfs2_freeze_lock(sdp, &freeze_gh,
-                                      log_write_allowed ? 0 : LM_FLAG_TRY);
+                       ret = gfs2_freeze_lock_shared(sdp, &freeze_gh,
+                                       log_write_allowed ? 0 : LM_FLAG_TRY);
                        if (ret == GLR_TRYFAILED)
                                ret = 0;
                }

diff --git a/fs/gfs2/util.h b/fs/gfs2/util.h
index 78ec190f4155be6a4f711f774126c1c75feefb64..3291e33e81e97058167adc2c1102d47480bd4af1 100644 (file)
--- a/fs/gfs2/util.h
+++ b/fs/gfs2/util.h
@@ -149,8 +149,9 @@ int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function,
 
 extern int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
                               bool verbose);
-extern int gfs2_freeze_lock(struct gfs2_sbd *sdp,
-                           struct gfs2_holder *freeze_gh, int caller_flags);
+extern int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp,
+                                  struct gfs2_holder *freeze_gh,
+                                  int caller_flags);
 extern void gfs2_freeze_unlock(struct gfs2_holder *freeze_gh);
 
 #define gfs2_io_error(sdp) \