Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87839d9b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: GKI: kernfs.h: add Android ABI padding to some structures 



Try to mitigate potential future driver core api changes by adding a
padding to struct kernfs_syscall_ops and struct kernfs_ops.

Based on a change made to the RHEL/CENTOS 8 kernel.

Bug: 151154716
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I1fcb0b81c3ea7d5300da283b275391f95d6d4ec8
parent 08b2c8d8

include/linux/kernfs.h

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/atomic.h>

#include <linux/uidgid.h>

#include <linux/wait.h>

#include <linux/android_kabi.h>



struct file;

struct dentry;
@@ -178,6 +179,11 @@ struct kernfs_syscall_ops { 
		      const char *new_name);

	int (*show_path)(struct seq_file *sf, struct kernfs_node *kn,

			 struct kernfs_root *root);



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

	ANDROID_KABI_RESERVE(3);

	ANDROID_KABI_RESERVE(4);

};



struct kernfs_root {
@@ -271,6 +277,9 @@ struct kernfs_ops { 
#ifdef CONFIG_DEBUG_LOCK_ALLOC

	struct lock_class_key	lockdep_key;

#endif



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

};



#ifdef CONFIG_KERNFS