HAMMER: Deactivate dedup in 2.8.

It was MFC'd due to suboptimal commit separation, so disallow access
to the HAMMERIOC_DEDUP ioctl in 2.8.

Also clarify this in the message we print when hammer(8) encounters
a <v5 file system.

Submitted-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/sbin/hammer/cmd_dedup.c b/sbin/hammer/cmd_dedup.c
index 872a474..dbc327a 100644 (file)
--- a/sbin/hammer/cmd_dedup.c
+++ b/sbin/hammer/cmd_dedup.c
@@ -467,8 +467,9 @@ process_btree_elm(hammer_btree_leaf_elm_t scan_leaf, int flags)
                        goto upgrade_stats_sha;
                case DEDUP_VERS_FAILURE:
                        fprintf(stderr,
-                               "HAMMER filesystem must be at least "
-                               "version 5 to dedup\n");
+                               "The filesystem must be at least "
+                               "version 5 to dedup and you have to run\n"
+                               "at least 2.9-DEVELOPMENT to use it.\n");
                        exit (1);
                default:
                        fprintf(stderr, "Unknown error\n");
@@ -510,8 +511,9 @@ sha256_failure:
                        goto upgrade_stats;
                case DEDUP_VERS_FAILURE:
                        fprintf(stderr,
-                               "HAMMER filesystem must be at least "
-                               "version 5 to dedup\n");
+                               "The filesystem must be at least "
+                               "version 5 to dedup and you have to run\n"
+                               "at least 2.9-DEVELOPMENT to use it.\n");
                        exit (1);
                default:
                        fprintf(stderr, "Unknown error\n");

diff --git a/sys/vfs/hammer/hammer_dedup.c b/sys/vfs/hammer/hammer_dedup.c
index 0bb74b5..0030659 100644 (file)
--- a/sys/vfs/hammer/hammer_dedup.c
+++ b/sys/vfs/hammer/hammer_dedup.c
@@ -43,6 +43,9 @@ hammer_ioc_dedup(hammer_transaction_t trans, hammer_inode_t ip,
        struct hammer_cursor cursor1, cursor2;
        int error;
 
+       kprintf("hammer: Dedup is not supported in the 2.8 release\n");
+       return (EOPNOTSUPP);
+
        /*
         * Enforce hammer filesystem version requirements
         */