Skip to content

Commit 0c95c02

Browse files
braunerbrauner
committed
fs: drop unused posix acl handlers
Remove struct posix_acl_{access,default}_handler for all filesystems that don't depend on the xattr handler in their inode->i_op->listxattr() method in any way. There's nothing more to do than to simply remove the handler. It's been effectively unused ever since we introduced the new posix acl api. Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Christian Brauner (Microsoft) <[email protected]>
1 parent 831be97 commit 0c95c02

File tree

21 files changed

+0
-80
lines changed

21 files changed

+0
-80
lines changed

‎fs/9p/xattr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@ static struct xattr_handler v9fs_xattr_security_handler = {
183183
const struct xattr_handler *v9fs_xattr_handlers[] = {
184184
&v9fs_xattr_user_handler,
185185
&v9fs_xattr_trusted_handler,
186-
#ifdef CONFIG_FS_POSIX_ACL
187-
&posix_acl_access_xattr_handler,
188-
&posix_acl_default_xattr_handler,
189-
#endif
190186
#ifdef CONFIG_9P_FS_SECURITY
191187
&v9fs_xattr_security_handler,
192188
#endif

‎fs/btrfs/xattr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,6 @@ static const struct xattr_handler btrfs_btrfs_xattr_handler = {
444444

445445
const struct xattr_handler *btrfs_xattr_handlers[] = {
446446
&btrfs_security_xattr_handler,
447-
#ifdef CONFIG_BTRFS_FS_POSIX_ACL
448-
&posix_acl_access_xattr_handler,
449-
&posix_acl_default_xattr_handler,
450-
#endif
451447
&btrfs_trusted_xattr_handler,
452448
&btrfs_user_xattr_handler,
453449
&btrfs_btrfs_xattr_handler,

‎fs/ceph/xattr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,10 +1411,6 @@ void ceph_release_acl_sec_ctx(struct ceph_acl_sec_ctx *as_ctx)
14111411
* attributes are handled directly.
14121412
*/
14131413
const struct xattr_handler *ceph_xattr_handlers[] = {
1414-
#ifdef CONFIG_CEPH_FS_POSIX_ACL
1415-
&posix_acl_access_xattr_handler,
1416-
&posix_acl_default_xattr_handler,
1417-
#endif
14181414
&ceph_other_xattr_handler,
14191415
NULL,
14201416
};

‎fs/cifs/xattr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,5 @@ const struct xattr_handler *cifs_xattr_handlers[] = {
487487
&smb3_ntsd_xattr_handler, /* alias for above since avoiding "cifs" */
488488
&cifs_cifs_ntsd_full_xattr_handler,
489489
&smb3_ntsd_full_xattr_handler, /* alias for above since avoiding "cifs" */
490-
#ifdef CONFIG_FS_POSIX_ACL
491-
&posix_acl_access_xattr_handler,
492-
&posix_acl_default_xattr_handler,
493-
#endif
494490
NULL
495491
};

‎fs/ecryptfs/inode.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,10 +1210,6 @@ static const struct xattr_handler ecryptfs_xattr_handler = {
12101210
};
12111211

12121212
const struct xattr_handler *ecryptfs_xattr_handlers[] = {
1213-
#ifdef CONFIG_FS_POSIX_ACL
1214-
&posix_acl_access_xattr_handler,
1215-
&posix_acl_default_xattr_handler,
1216-
#endif
12171213
&ecryptfs_xattr_handler,
12181214
NULL
12191215
};

‎fs/erofs/xattr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,10 +463,6 @@ const struct xattr_handler __maybe_unused erofs_xattr_security_handler = {
463463

464464
const struct xattr_handler *erofs_xattr_handlers[] = {
465465
&erofs_xattr_user_handler,
466-
#ifdef CONFIG_EROFS_FS_POSIX_ACL
467-
&posix_acl_access_xattr_handler,
468-
&posix_acl_default_xattr_handler,
469-
#endif
470466
&erofs_xattr_trusted_handler,
471467
#ifdef CONFIG_EROFS_FS_SECURITY
472468
&erofs_xattr_security_handler,

‎fs/ext2/xattr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,6 @@ static const struct xattr_handler *ext2_xattr_handler_map[] = {
113113
const struct xattr_handler *ext2_xattr_handlers[] = {
114114
&ext2_xattr_user_handler,
115115
&ext2_xattr_trusted_handler,
116-
#ifdef CONFIG_EXT2_FS_POSIX_ACL
117-
&posix_acl_access_xattr_handler,
118-
&posix_acl_default_xattr_handler,
119-
#endif
120116
#ifdef CONFIG_EXT2_FS_SECURITY
121117
&ext2_xattr_security_handler,
122118
#endif

‎fs/ext4/xattr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ static const struct xattr_handler * const ext4_xattr_handler_map[] = {
101101
const struct xattr_handler *ext4_xattr_handlers[] = {
102102
&ext4_xattr_user_handler,
103103
&ext4_xattr_trusted_handler,
104-
#ifdef CONFIG_EXT4_FS_POSIX_ACL
105-
&posix_acl_access_xattr_handler,
106-
&posix_acl_default_xattr_handler,
107-
#endif
108104
#ifdef CONFIG_EXT4_FS_SECURITY
109105
&ext4_xattr_security_handler,
110106
#endif

‎fs/f2fs/xattr.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,6 @@ static const struct xattr_handler *f2fs_xattr_handler_map[] = {
204204

205205
const struct xattr_handler *f2fs_xattr_handlers[] = {
206206
&f2fs_xattr_user_handler,
207-
#ifdef CONFIG_F2FS_FS_POSIX_ACL
208-
&posix_acl_access_xattr_handler,
209-
&posix_acl_default_xattr_handler,
210-
#endif
211207
&f2fs_xattr_trusted_handler,
212208
#ifdef CONFIG_F2FS_FS_SECURITY
213209
&f2fs_xattr_security_handler,

‎fs/gfs2/xattr.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,8 +1501,6 @@ const struct xattr_handler *gfs2_xattr_handlers_max[] = {
15011501
/* GFS2_FS_FORMAT_MIN */
15021502
&gfs2_xattr_user_handler,
15031503
&gfs2_xattr_security_handler,
1504-
&posix_acl_access_xattr_handler,
1505-
&posix_acl_default_xattr_handler,
15061504
NULL,
15071505
};
15081506

0 commit comments

Comments
 (0)