Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[~shefty/rdma-dev.git] / fs / gfs2 / sys.c

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index e6d8d48..597a612 100644 (file)
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -91,19 +91,15 @@ static ssize_t uuid_show(struct gfs2_sbd *sdp, char *buf)
 
 static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)
 {
-       unsigned int count;
-
-       mutex_lock(&sdp->sd_freeze_lock);
-       count = sdp->sd_freeze_count;
-       mutex_unlock(&sdp->sd_freeze_lock);
+       struct super_block *sb = sdp->sd_vfs;
+       int frozen = (sb->s_writers.frozen == SB_UNFROZEN) ? 0 : 1;
 
-       return snprintf(buf, PAGE_SIZE, "%u\n", count);
+       return snprintf(buf, PAGE_SIZE, "%u\n", frozen);
 }
 
 static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 {
-       ssize_t ret = len;
-       int error = 0;
+       int error;
        int n = simple_strtol(buf, NULL, 0);
 
        if (!capable(CAP_SYS_ADMIN))
@@ -111,19 +107,21 @@ static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 
        switch (n) {
        case 0:
-               gfs2_unfreeze_fs(sdp);
+               error = thaw_super(sdp->sd_vfs);
                break;
        case 1:
-               error = gfs2_freeze_fs(sdp);
+               error = freeze_super(sdp->sd_vfs);
                break;
        default:
-               ret = -EINVAL;
+               return -EINVAL;
        }
 
-       if (error)
+       if (error) {
                fs_warn(sdp, "freeze %d error %d", n, error);
+               return error;
+       }
 
-       return ret;
+       return len;
 }
 
 static ssize_t withdraw_show(struct gfs2_sbd *sdp, char *buf)
@@ -342,6 +340,28 @@ static ssize_t block_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
        return ret;
 }
 
+static ssize_t wdack_show(struct gfs2_sbd *sdp, char *buf)
+{
+       int val = completion_done(&sdp->sd_wdack) ? 1 : 0;
+
+       return sprintf(buf, "%d\n", val);
+}
+
+static ssize_t wdack_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
+{
+       ssize_t ret = len;
+       int val;
+
+       val = simple_strtol(buf, NULL, 0);
+
+       if ((val == 1) &&
+           !strcmp(sdp->sd_lockstruct.ls_ops->lm_proto_name, "lock_dlm"))
+               complete(&sdp->sd_wdack);
+       else
+               ret = -EINVAL;
+       return ret;
+}
+
 static ssize_t lkfirst_show(struct gfs2_sbd *sdp, char *buf)
 {
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
@@ -473,7 +493,7 @@ static struct gfs2_attr gdlm_attr_##_name = __ATTR(_name,_mode,_show,_store)
 
 GDLM_ATTR(proto_name,          0444, proto_name_show,          NULL);
 GDLM_ATTR(block,               0644, block_show,               block_store);
-GDLM_ATTR(withdraw,            0644, withdraw_show,            withdraw_store);
+GDLM_ATTR(withdraw,            0644, wdack_show,               wdack_store);
 GDLM_ATTR(jid,                 0644, jid_show,                 jid_store);
 GDLM_ATTR(first,               0644, lkfirst_show,             lkfirst_store);
 GDLM_ATTR(first_done,          0444, first_done_show,          NULL);