]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ocfs2: add dlm_recover_callback_support in sysfs
authorGoldwyn Rodrigues <rgoldwyn@suse.de>
Thu, 3 Apr 2014 21:46:52 +0000 (14:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Apr 2014 23:20:54 +0000 (16:20 -0700)
This is a part of the nocontrold feature which was incorporated sometime
back.

This is required for backward compatibility of the tools, specifically
the scenario where the tools with recovery callback is used with a
kernel not using the recovery callbacks (older kernel + newer tools).
The tools look for this file to understand if the kernel supports DLM
recovery callbacks.

For kernels which support recovery callbacks but will miss this patch,
ocfs2 will continue to use the older API and would still be able to
mount the filesystem.

[akpm@linux-foundation.org: simplify]
[sfr@canb.auug.org.au: VERIFY_OCTAL_PERMISSIONS fix up]
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/stackglue.c

index ca5ce14cbddcef81498305f8ccbccc978750faed..5c8343fe74382e24a4a42c28ae30c1292ea4355a 100644 (file)
@@ -603,11 +603,25 @@ static struct kobj_attribute ocfs2_attr_cluster_stack =
               ocfs2_cluster_stack_show,
               ocfs2_cluster_stack_store);
 
+
+
+static ssize_t ocfs2_dlm_recover_show(struct kobject *kobj,
+                                       struct kobj_attribute *attr,
+                                       char *buf)
+{
+       return snprintf(buf, PAGE_SIZE, "1\n");
+}
+
+static struct kobj_attribute ocfs2_attr_dlm_recover_support =
+       __ATTR(dlm_recover_callback_support, S_IRUGO,
+              ocfs2_dlm_recover_show, NULL);
+
 static struct attribute *ocfs2_attrs[] = {
        &ocfs2_attr_max_locking_protocol.attr,
        &ocfs2_attr_loaded_cluster_plugins.attr,
        &ocfs2_attr_active_cluster_plugin.attr,
        &ocfs2_attr_cluster_stack.attr,
+       &ocfs2_attr_dlm_recover_support.attr,
        NULL,
 };