Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Try to mitigate potential future driver core api changes by adding a
padding to struct quota_format_ops, struct dquot_operations, and struct
quotactl_ops.

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

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia957d2f8d9b1a6939cddedc16a7481e9de1a8866
This commit is contained in:
Greg Kroah-Hartman 2020-05-02 09:42:59 +02:00
parent a74c0e4e91
commit 86fe2f158e
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/linux/quota.h
View file

@ -316,6 +316,9 @@ struct quota_format_ops {
int (*commit_dqblk)(struct dquot *dquot); /* Write structure for one user */ int (*commit_dqblk)(struct dquot *dquot); /* Write structure for one user */
int (*release_dqblk)(struct dquot *dquot); /* Called when last reference to dquot is being dropped */ int (*release_dqblk)(struct dquot *dquot); /* Called when last reference to dquot is being dropped */
int (*get_next_id)(struct super_block *sb, struct kqid *qid); /* Get next ID with existing structure in the quota file */ int (*get_next_id)(struct super_block *sb, struct kqid *qid); /* Get next ID with existing structure in the quota file */
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
/* Operations working with dquots */ /* Operations working with dquots */
@ -335,6 +338,9 @@ struct dquot_operations {
int (*get_inode_usage) (struct inode *, qsize_t *); int (*get_inode_usage) (struct inode *, qsize_t *);
/* Get next ID with active quota structure */ /* Get next ID with active quota structure */
int (*get_next_id) (struct super_block *sb, struct kqid *qid); int (*get_next_id) (struct super_block *sb, struct kqid *qid);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
struct path; struct path;
@ -438,6 +444,9 @@ struct quotactl_ops {
int (*set_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *); int (*set_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
int (*get_state)(struct super_block *, struct qc_state *); int (*get_state)(struct super_block *, struct qc_state *);
int (*rm_xquota)(struct super_block *, unsigned int); int (*rm_xquota)(struct super_block *, unsigned int);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
struct quota_format_type { struct quota_format_type {