LU-11355 lustre: enable fstrim on lustre device

[fs/lustre-release.git] / lustre / obdclass / obd_mount_server.c

diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c
index a4f0e4b..42af490 100644 (file)
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -556,7 +556,7 @@ again:
 }
 EXPORT_SYMBOL(lustre_notify_lwp_list);
 
-static int lustre_lwp_connect(struct obd_device *lwp)
+static int lustre_lwp_connect(struct obd_device *lwp, bool is_mdt)
 {
        struct lu_env            env;
        struct lu_context        session_ctx;
@@ -582,11 +582,14 @@ static int lustre_lwp_connect(struct obd_device *lwp)
 
        data->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_INDEX;
        data->ocd_version = LUSTRE_VERSION_CODE;
-       data->ocd_connect_flags |= OBD_CONNECT_MDS_MDS | OBD_CONNECT_FID |
-               OBD_CONNECT_AT | OBD_CONNECT_LRU_RESIZE |
-               OBD_CONNECT_FULL20 | OBD_CONNECT_LVB_TYPE |
-               OBD_CONNECT_LIGHTWEIGHT | OBD_CONNECT_LFSCK |
-               OBD_CONNECT_BULK_MBITS;
+       data->ocd_connect_flags |= OBD_CONNECT_FID | OBD_CONNECT_AT |
+               OBD_CONNECT_LRU_RESIZE | OBD_CONNECT_FULL20 |
+               OBD_CONNECT_LVB_TYPE | OBD_CONNECT_LIGHTWEIGHT |
+               OBD_CONNECT_LFSCK | OBD_CONNECT_BULK_MBITS;
+
+       if (is_mdt)
+               data->ocd_connect_flags |= OBD_CONNECT_MDS_MDS;
+
        OBD_ALLOC_PTR(uuid);
        if (uuid == NULL)
                GOTO(out, rc = -ENOMEM);
@@ -670,7 +673,7 @@ static int lustre_lwp_setup(struct lustre_cfg *lcfg, struct lustre_sb_info *lsi,
        obd = class_name2obd(lwpname);
        LASSERT(obd != NULL);
 
-       rc = lustre_lwp_connect(obd);
+       rc = lustre_lwp_connect(obd, strstr(lsi->lsi_svname, "-MDT") != NULL);
        if (rc == 0) {
                obd->u.cli.cl_max_mds_easize = MAX_MD_SIZE;
                spin_lock(&lsi->lsi_lwp_lock);
@@ -931,7 +934,7 @@ static int lustre_disconnect_lwp(struct super_block *sb)
                        GOTO(out, rc = -ENOMEM);
 
                /* end log first */
-               cfg->cfg_instance = sb;
+               cfg->cfg_instance = ll_get_cfg_instance(sb);
                rc = lustre_end_log(sb, logname, cfg);
                if (rc != 0 && rc != -ENOENT)
                        GOTO(out, rc);
@@ -1043,7 +1046,7 @@ static int lustre_start_lwp(struct super_block *sb)
                GOTO(out, rc = -ENOMEM);
 
        cfg->cfg_callback = client_lwp_config_process;
-       cfg->cfg_instance = sb;
+       cfg->cfg_instance = ll_get_cfg_instance(sb);
        rc = lustre_process_log(sb, logname, cfg);
        /* need to remove config llog from mgc */
        lsi->lsi_lwp_started = 1;
@@ -1766,6 +1769,43 @@ static ssize_t lustre_listxattr(struct dentry *d_entry, char *name,
        return -EOPNOTSUPP;
 }
 
+static bool is_cmd_supported(unsigned int command)
+{
+       switch (command) {
+       case FITRIM:
+               return true;
+       default:
+               return false;
+       }
+
+       return false;
+}
+
+static long server_ioctl(struct file *filp, unsigned int command,
+                        unsigned long arg)
+{
+       struct file active_filp;
+       struct inode *inode = file_inode(filp);
+       struct lustre_sb_info *lsi = s2lsi(inode->i_sb);
+       struct super_block *dd_sb = dt_mnt_sb_get(lsi->lsi_dt_dev);
+       struct inode *active_inode;
+       int err = -EOPNOTSUPP;
+
+       if (IS_ERR(dd_sb) || !is_cmd_supported(command))
+               return err;
+
+       active_inode = igrab(dd_sb->s_root->d_inode);
+       if (!active_inode)
+               return -EACCES;
+
+       active_filp.f_inode = active_inode;
+       if (active_inode->i_fop && active_inode->i_fop->unlocked_ioctl)
+               err = active_inode->i_fop->unlocked_ioctl(&active_filp,
+                                                         command, arg);
+       iput(active_inode);
+       return err;
+}
+
 static const struct inode_operations server_inode_operations = {
 #ifdef HAVE_IOP_XATTR
        .setxattr       = lustre_setxattr,
@@ -1774,6 +1814,10 @@ static const struct inode_operations server_inode_operations = {
        .listxattr      = lustre_listxattr,
 };
 
+static const struct file_operations server_file_operations = {
+       .unlocked_ioctl = server_ioctl,
+};
+
 #define log2(n) ffz(~(n))
 #define LUSTRE_SUPER_MAGIC 0x0BD00BD1
 
@@ -1802,6 +1846,7 @@ static int server_fill_super_common(struct super_block *sb)
        /* apparently we need to be a directory for the mount to finish */
        root->i_mode = S_IFDIR;
        root->i_op = &server_inode_operations;
+       root->i_fop = &server_file_operations;
        sb->s_root = d_make_root(root);
        if (!sb->s_root) {
                CERROR("%s: can't make root dentry\n", sb->s_id);