diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 971724cba487..fd22fc03651d 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1713,11 +1713,12 @@ struct f2fs_sb_info { /* for skip statistic */ unsigned long long skipped_gc_rwsem; /* FG_GC only */ - /* free sections reserved for pinned file */ - unsigned int reserved_pin_section; - /* threshold for gc trials on pinned files */ unsigned short gc_pin_file_threshold; + + /* free sections reserved for pinned file */ + ANDROID_KABI_IGNORE(0, unsigned int reserved_pin_section); + struct f2fs_rwsem pin_sem; /* maximum # of trials to find a victim segment for SSR and GC */ diff --git a/gki/aarch64/abi.stg b/gki/aarch64/abi.stg index e20c8d013847..12f656ac9920 100644 --- a/gki/aarch64/abi.stg +++ b/gki/aarch64/abi.stg @@ -49875,6 +49875,11 @@ member { type_id: 0x63891ef9 offset: 928 } +member { + id: 0x3b2a0ab9 + type_id: 0x638666c6 + offset: 20832 +} member { id: 0x3b320430 type_id: 0x63e6543d @@ -53953,6 +53958,11 @@ member { name: "__iov" type_id: 0x3ea6bd8c } +member { + id: 0x936cb8af + name: "__kabi_ignored0" + type_id: 0x5d8155a5 +} member { id: 0x4140f02a name: "__kabi_reserved1" @@ -207044,6 +207054,11 @@ member { type_id: 0x7584e7da offset: 32 } +member { + id: 0xd56180a7 + name: "reserved_pin_section" + type_id: 0x4585663f +} member { id: 0xcbc32f04 name: "reserved_segments" @@ -271263,6 +271278,15 @@ struct_union { member_id: 0x95dac977 } } +struct_union { + id: 0x638666c6 + kind: UNION + definition { + bytesize: 4 + member_id: 0xd56180a7 + member_id: 0x936cb8af + } +} struct_union { id: 0x63891ef9 kind: UNION @@ -303376,6 +303400,7 @@ struct_union { member_id: 0x8bdb6595 member_id: 0x81b511b8 member_id: 0x1f9d16da + member_id: 0x3b2a0ab9 member_id: 0x22d5b74c member_id: 0xb05ca32a member_id: 0x57292a6b diff --git a/gki/aarch64/abi.stg.allowed_breaks b/gki/aarch64/abi.stg.allowed_breaks index 3e940d19107e..4b67358f0348 100644 --- a/gki/aarch64/abi.stg.allowed_breaks +++ b/gki/aarch64/abi.stg.allowed_breaks @@ -7,3 +7,6 @@ type 'enum prs_errcode' changed type 'struct sched_dl_entity' changed member 'unsigned int dl_server_idle:1' was added +type 'struct f2fs_sb_info' changed + member 'union { unsigned int reserved_pin_section; unsigned char __kabi_ignored0; }' was added +