LU-13805 revert "osd: Implement unaligned DIO connect flag"

This reverts commit 88d324be08a44364aea9ff73c362a5e4ed4aaf6e.

There are further compatibility issues with UDIO on master and
this flag may be used for more than just ZFS compatibility, so
should not be advertised by servers for compatibility just yet.

Change-Id: Id357fa1a735ef4b8d6d90218250888f4ee04e5af
Test-Parameters: trivial
Fixes: 88d324be08 ("LU-13805: osd: Implement unaligned DIO connect flag")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54287
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>

diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h
index 242248c..32a044a 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_idl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h
@@ -941,8 +941,7 @@ struct ptlrpc_body_v2 {
                                OBD_CONNECT2_PCCRO | \
                                OBD_CONNECT2_ATOMIC_OPEN_LOCK | \
                                OBD_CONNECT2_ENCRYPT_NAME | \
-                               OBD_CONNECT2_ENCRYPT_FID2PATH | \
-                               OBD_CONNECT2_UNALIGNED_DIO)
+                               OBD_CONNECT2_ENCRYPT_FID2PATH)
 
 #define OST_CONNECT_SUPPORTED  (OBD_CONNECT_SRVLOCK | OBD_CONNECT_GRANT | \
                                OBD_CONNECT_REQPORTAL | OBD_CONNECT_VERSION | \
@@ -966,8 +965,7 @@ struct ptlrpc_body_v2 {
 #define OST_CONNECT_SUPPORTED2 (OBD_CONNECT2_LOCKAHEAD | OBD_CONNECT2_INC_XID |\
                                OBD_CONNECT2_ENCRYPT | OBD_CONNECT2_LSEEK | \
                                OBD_CONNECT2_REPLAY_CREATE | \
-                               OBD_CONNECT2_COMPRESS | \
-                               OBD_CONNECT2_UNALIGNED_DIO)
+                               OBD_CONNECT2_COMPRESS)
 
 #define ECHO_CONNECT_SUPPORTED (OBD_CONNECT_FID)
 #define ECHO_CONNECT_SUPPORTED2 0

diff --git a/lustre/osd-zfs/osd_io.c b/lustre/osd-zfs/osd_io.c
index fef6523..bdf6a60 100644 (file)
--- a/lustre/osd-zfs/osd_io.c
+++ b/lustre/osd-zfs/osd_io.c
@@ -299,6 +299,7 @@ static int osd_bufs_put(const struct lu_env *env, struct dt_object *dt,
 
 static inline struct page *kmem_to_page(void *addr)
 {
+       LASSERT(!((unsigned long)addr & ~PAGE_MASK));
        if (is_vmalloc_addr(addr))
                return vmalloc_to_page(addr);
        else