LU-18433 llite: remove unused ci_target_is_zfs check

The check is not longer used and can safely removed.

HPE-bug-id: LUS-12597
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: If3cb2a11b773f19f53de905be84ad32a92bb47c9
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56932
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h
index 9dccd16..67dc435 100644 (file)
--- a/lustre/include/cl_object.h
+++ b/lustre/include/cl_object.h
@@ -1917,13 +1917,6 @@ struct cl_io {
         */
                             ci_unaligned_dio:1,
        /**
-        * there is a compat issue with unupgraded ZFS targets which means we
-        * must refuse to do unaligned DIO to these targets, so this is used
-        * to annotate that in the IO (since we learn if there is a problematic
-        * OST/MDT target as we build the IO)
-        */
-                            ci_target_is_zfs:1,
-       /**
         * there is an interop issue with unpatched clients/servers that
         * exceed 4k read/write offsets with I/O exceeding LNET_MTU.
         * This flag cleared if a target is not patched.

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index 12df085..7e0700b 100644 (file)
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -514,18 +514,6 @@ static inline bool exp_connect_batch_rpc(struct obd_export *exp)
        return (exp_connect_flags2(exp) & OBD_CONNECT2_BATCH_RPC);
 }
 
-static inline bool exp_connect_target_is_zfs(struct obd_export *exp)
-{
-       struct obd_connect_data *ocd = &exp->exp_connect_data;
-       bool is_zfs = false;
-
-       /* > 2ULL << 59 implies ZFS, so this is ldiskfs */
-       if (exp_connect_flags(exp) & OBD_CONNECT_MAXBYTES)
-               is_zfs = !(ocd->ocd_maxbytes < (2ULL << 59));
-
-       return is_zfs;
-}
-
 enum {
        /* archive_ids in array format */
        KKUC_CT_DATA_ARRAY_MAGIC        = 0x092013cea,

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 924d128..c3e2036 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1699,7 +1699,6 @@ void ll_io_init(struct cl_io *io, struct file *file, enum cl_io_type iot,
         * avaliable mirror for write.
         */
        io->ci_ndelay = !(iot == CIT_WRITE);
-       io->ci_target_is_zfs = 0;
        /* unaligned DIO has compat issues with some older servers, but we find
         * out if there are such servers while setting up the IO, so it starts
         * out allowed

diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c
index ecdb975..3382fe9 100644 (file)
--- a/lustre/osc/osc_io.c
+++ b/lustre/osc/osc_io.c
@@ -1333,8 +1333,6 @@ int osc_io_init(const struct lu_env *env,
        CL_IO_SLICE_CLEAN(oio, oi_cl);
        cl_io_slice_add(io, &oio->oi_cl, obj, &osc_io_ops);
 
-       if (exp_connect_target_is_zfs(exp))
-               cl_io_top(io)->ci_target_is_zfs = 1;
        if (!exp_connect_unaligned_dio(exp))
                cl_io_top(io)->ci_allow_unaligned_dio = false;