[Devel,RHEL7,COMMIT] Revert "autofs: fix autofs_v5_packet structure for compat mode"

Submitted by Konstantin Khorenko on Aug. 31, 2017, 3:01 p.m.

Details

Message ID 201708311501.v7VF1PDa016978@finist_ce7.work
State New
Series "autofs: fix autofs_v5_packet structure for compat mode"
Headers show

Commit Message

Konstantin Khorenko Aug. 31, 2017, 3:01 p.m.
The commit is pushed to "branch-rh7-3.10.0-514.26.1.vz7.35.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.26.1.vz7.35.5
------>
commit a24e586ec36bf182a3261a9608e8515d424b242e
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Thu Aug 31 17:56:44 2017 +0300

    Revert "autofs: fix autofs_v5_packet structure for compat mode"
    
    This reverts commit e484b0abe8af8793f58e6434060a3779261d3151.
    
    The patch is question increases the offsetof(struct autofs_v5_packet, name) by
    4 which is not good, the patch is to be reworked.
    
    Thanks to Dmitry V. Levin for noticing it.
    
    https://jira.sw.ru/browse/PSBM-71078
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 include/uapi/linux/auto_fs4.h | 2 --
 1 file changed, 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/include/uapi/linux/auto_fs4.h b/include/uapi/linux/auto_fs4.h
index 8729a47..e02982f 100644
--- a/include/uapi/linux/auto_fs4.h
+++ b/include/uapi/linux/auto_fs4.h
@@ -137,8 +137,6 @@  struct autofs_v5_packet {
 	__u32 pid;
 	__u32 tgid;
 	__u32 len;
-	__u32 blob;		/* This is needed to align structure up to 8
-				   bytes for ALL archs including 32-bit */
 	char name[NAME_MAX+1];
 };