reiserfs xattr fixups
cover reiserfs xattr fixups
Here are my remaining patches for reiserfs in 2.6.30:
- reiserfs-xattr-fixup: Cleans up some ifdefs
- reiserfs-xattr-root-fixup: Fixes an oops on open_xa_dir with CONFIG_REISERFS_FS_XATTR=n
- reiserfs-xattrs-disabled-perms: Fixes warnings on delete with
CONFIG_REISERFS_FS_XATTR=n (bko#13122)
- reiserfs-expose-privroot: Adds a -oexpose_privroot that will allow access to the privroot.
Please apply.
-Jeff
--
Jeff Mahoney
SUSE Labs
PATCH 1/4 reiserfs: clean up ifdefs
With xattr cleanup even with xattrs disabled, much of the initial setup is still performed. Some #ifdefs are just not needed since the options they protect wouldn't be available anyway.
This patch cleans those up.
--- fs/reiserfs/xattr.c | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-)
fs/reiserfs/xattr.c +22 -23
@@ -685,20 +685,6 @@ out:return err; } -/* Actual operations that are exported to VFS-land */ -struct xattr_handler *reiserfs_xattr_handlers[] = { - &reiserfs_xattr_user_handler, - &reiserfs_xattr_trusted_handler, -#ifdef CONFIG_REISERFS_FS_SECURITY - &reiserfs_xattr_security_handler, -#endif -#ifdef CONFIG_REISERFS_FS_POSIX_ACL - &reiserfs_posix_acl_access_handler, - &reiserfs_posix_acl_default_handler, -#endif -NULL -}; -/* * In order to implement different sets of xattr operations for each xattr * prefix with the generic xattr API, a filesystem should create a
@@ -922,6 +908,28 @@ static int create_privroot(struct dentryreturn 0 ; } +#else +int __init reiserfs_xattr_register_handlers (void ) {return 0 ; } +void reiserfs_xattr_unregister_handlers (void ) {} +static int create_privroot (struct dentry *dentry) {return 0 ; } +#endif + +/* Actual operations that are exported to VFS-land */ +struct xattr_handler *reiserfs_xattr_handlers[] = { +#ifdef CONFIG_REISERFS_FS_XATTR + &reiserfs_xattr_user_handler, + &reiserfs_xattr_trusted_handler, +#endif +#ifdef CONFIG_REISERFS_FS_SECURITY + &reiserfs_xattr_security_handler, +#endif +#ifdef CONFIG_REISERFS_FS_POSIX_ACL + &reiserfs_posix_acl_access_handler, + &reiserfs_posix_acl_default_handler, +#endif +NULL +}; +static int xattr_mount_check (struct super_block *s) {/* We need generation numbers to ensure that the oid mapping is correct
@@ -941,11 +949,6 @@ static int xattr_mount_check(struct supereturn 0 ; } -#else -int __init reiserfs_xattr_register_handlers (void ) {return 0 ; } -void reiserfs_xattr_unregister_handlers (void ) {} -#endif -/* This will catch lookups from the fs root to .reiserfs_priv */ static int xattr_lookup_poison (struct dentry *dentry,struct qstr *q1,struct qstr *name)
@@ -992,7 +995,6 @@ int reiserfs_xattr_init(struct super_bloint err =0 ;struct dentry *privroot =REISERFS_SB (s)->priv_root; -#ifdef CONFIG_REISERFS_FS_XATTR err =xattr_mount_check (s);if (err) goto error;
@@ -1023,14 +1025,11 @@ error:clear_bit (REISERFS_XATTRS_USER , &(REISERFS_SB (s)->s_mount_opt));clear_bit (REISERFS_POSIXACL , &(REISERFS_SB (s)->s_mount_opt)); } -#endif /* The super_block MS_POSIXACL must mirror the (no)acl mount option. */ -#ifdef CONFIG_REISERFS_FS_POSIX_ACL if (reiserfs_posixacl (s)) s->s_flags |=MS_POSIXACL ;else -#endif s->s_flags &= ~MS_POSIXACL ;return err;
PATCH 2/4 reiserfs: deal with NULL xattr root w/ xattrs disabled
In reply to Jeff Mahoney This patch avoids an Oops in open_xa_root that can occur when deleting a file with xattrs disabled. It assumes that the xattr root will be there, and that is not guaranteed.
--- fs/reiserfs/super.c | 2 -- fs/reiserfs/xattr.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/reiserfs/super.c +0 -2
@@ -448,13 +448,11 @@ int remove_save_link(struct inode *inodestatic void reiserfs_kill_sb (struct super_block *s) {if (REISERFS_SB (s)) { -#ifdef CONFIG_REISERFS_FS_XATTR if (REISERFS_SB (s)->xattr_root) {d_invalidate (REISERFS_SB (s)->xattr_root);dput (REISERFS_SB (s)->xattr_root);REISERFS_SB (s)->xattr_root =NULL ; } -#endif if (REISERFS_SB (s)->priv_root) {d_invalidate (REISERFS_SB (s)->priv_root);dput (REISERFS_SB (s)->priv_root);
fs/reiserfs/xattr.c +3 -1
@@ -123,7 +123,9 @@ static struct dentry *open_xa_root(strucmutex_lock_nested (&privroot->d_inode->i_mutex,I_MUTEX_XATTR ); xaroot =dget (REISERFS_SB (sb)->xattr_root); -if (!xaroot->d_inode) { +if (!xaroot) + xaroot =ERR_PTR (-ENODATA ); +else if (!xaroot->d_inode) {int err = -ENODATA ;if (xattr_may_create (flags)) err =xattr_mkdir (privroot->d_inode, xaroot,0700 );
PATCH 3/4 reiserfs: fixup perms when xattrs are disabled
In reply to Jeff Mahoney This patch CONFIG_REISERFS_FS_XATTR protection from reiserfs_permission.
This is needed to avoid warnings during file deletions and chowns with xattrs disabled.
--- fs/reiserfs/xattr.c | 37 ++++++++++++++++++++----------------- include/linux/reiserfs_xattr.h | 4 +--- 2 files changed, 21 insertions(+), 20 deletions(-)
fs/reiserfs/xattr.c +20 -17
@@ -869,23 +869,6 @@ static int reiserfs_check_acl(struct inoreturn error; } -int reiserfs_permission (struct inode *inode,int mask) -{ -/* -* We don't do permission checks on the internal objects. -* Permissions are determined by the "owning" object. -*/ -if (IS_PRIVATE (inode)) -return 0 ; -/* -* Stat data v1 doesn't support ACLs. -*/ -if (get_inode_sd_version (inode) ==STAT_DATA_V1 ) -return generic_permission (inode, mask,NULL ); -else -return generic_permission (inode, mask, reiserfs_check_acl); -} -static int create_privroot (struct dentry *dentry) {int err;
@@ -949,6 +932,26 @@ static int xattr_mount_check(struct supereturn 0 ; } +int reiserfs_permission (struct inode *inode,int mask) +{ +/* +* We don't do permission checks on the internal objects. +* Permissions are determined by the "owning" object. +*/ +if (IS_PRIVATE (inode)) +return 0 ; + +#ifdef CONFIG_REISERFS_FS_XATTR +/* +* Stat data v1 doesn't support ACLs. +*/ +if (get_inode_sd_version (inode) !=STAT_DATA_V1 ) +return generic_permission (inode, mask, reiserfs_check_acl); + else +#endif +return generic_permission (inode, mask,NULL ); +} +/* This will catch lookups from the fs root to .reiserfs_priv */ static int xattr_lookup_poison (struct dentry *dentry,struct qstr *q1,struct qstr *name)
include/linux/reiserfs_xattr.h +1 -3
@@ -41,6 +41,7 @@ int reiserfs_xattr_init(struct super_bloint reiserfs_lookup_privroot (struct super_block *sb);int reiserfs_delete_xattrs (struct inode *inode);int reiserfs_chown_xattrs (struct inode *inode,struct iattr *attrs); +int reiserfs_permission (struct inode *inode,int mask);#ifdef CONFIG_REISERFS_FS_XATTR #define has_xattr_dir (inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)
@@ -50,7 +51,6 @@ int reiserfs_setxattr(struct dentry *den const void *value, size_t size, int flags);ssize_t reiserfs_listxattr (struct dentry *dentry,char *buffer,size_t size);int reiserfs_removexattr (struct dentry *dentry,const char *name); -int reiserfs_permission (struct inode *inode,int mask);int reiserfs_xattr_get (struct inode *,const char *,void *,size_t );int reiserfs_xattr_set (struct inode *,const char *,const void *,size_t ,int );
@@ -117,8 +117,6 @@ static inline void reiserfs_init_xattr_r#define reiserfs_listxattr NULL#define reiserfs_removexattr NULL -#define reiserfs_permission NULL -static inline void reiserfs_init_xattr_rwsem (struct inode *inode) { }
PATCH 4/4 reiserfs: allow exposing privroot w/ xattrs enabled
In reply to Jeff MahoneyThis patch adds an -oexpose_privroot option to allow access to the privroot.
---
fs/reiserfs/dir.c | 10 ++++------ fs/reiserfs/super.c | 1 + fs/reiserfs/xattr.c | 3 ++- include/linux/reiserfs_fs_sb.h | 2 ++ 4 files changed, 9 insertions(+), 7 deletions(-)
fs/reiserfs/dir.c +4 -6
@@ -44,13 +44,11 @@ static int reiserfs_dir_fsync(struct filstatic inline bool is_privroot_deh (struct dentry *dir,struct reiserfs_de_head *deh) { -int ret =0 ; -#ifdef CONFIG_REISERFS_FS_XATTR struct dentry *privroot =REISERFS_SB (dir->d_sb)->priv_root; - ret = (dir == dir->d_parent && privroot->d_inode && - deh->deh_objectid ==INODE_PKEY (privroot->d_inode)->k_objectid); -#endif -return ret; +if (reiserfs_expose_privroot (dir->d_sb)) +return 0 ; +return (dir == dir->d_parent && privroot->d_inode && + deh->deh_objectid ==INODE_PKEY (privroot->d_inode)->k_objectid); } int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent,
fs/reiserfs/super.c +1 -0
@@ -898,6 +898,7 @@ static int reiserfs_parse_options(struct {"conv",.setmask = 1 << REISERFS_CONVERT}, {"attrs",.setmask = 1 << REISERFS_ATTRS}, {"noattrs",.clrmask = 1 << REISERFS_ATTRS}, + {"expose_privroot", .setmask = 1 << REISERFS_EXPOSE_PRIVROOT}, #ifdef CONFIG_REISERFS_FS_XATTR {"user_xattr",.setmask = 1 << REISERFS_XATTRS_USER}, {"nouser_xattr",.clrmask = 1 << REISERFS_XATTRS_USER},
fs/reiserfs/xattr.c +2 -1
@@ -982,7 +982,8 @@ int reiserfs_lookup_privroot(struct supe strlen(PRIVROOT_NAME));if (!IS_ERR (dentry)) {REISERFS_SB (s)->priv_root = dentry; - s->s_root->d_op = &xattr_lookup_poison_ops; +if (!reiserfs_expose_privroot (s)) + s->s_root->d_op = &xattr_lookup_poison_ops;if (dentry->d_inode) dentry->d_inode->i_flags |=S_PRIVATE ; }else
include/linux/reiserfs_fs_sb.h +2 -0
@@ -453,6 +453,7 @@ enum reiserfs_mount_options {REISERFS_ATTRS ,REISERFS_XATTRS_USER ,REISERFS_POSIXACL , +REISERFS_EXPOSE_PRIVROOT ,REISERFS_BARRIER_NONE , REISERFS_BARRIER_FLUSH,
@@ -490,6 +491,7 @@ enum reiserfs_mount_options {#define reiserfs_data_writeback (s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_WRITEBACK))#define reiserfs_xattrs_user (s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_XATTRS_USER))#define reiserfs_posixacl (s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_POSIXACL)) +#define reiserfs_expose_privroot (s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_EXPOSE_PRIVROOT))#define reiserfs_xattrs_optional (s) (reiserfs_xattrs_user(s) || reiserfs_posixacl(s))#define reiserfs_barrier_none (s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_BARRIER_NONE))#define reiserfs_barrier_flush (s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_BARRIER_FLUSH))
Quoted 9 lines · Jeff Mahoney
Here are my remaining patches for reiserfs in 2.6.30:
- reiserfs-xattr-fixup: Cleans up some ifdefs
- reiserfs-xattr-root-fixup: Fixes an oops onopen_xa_dirwithCONFIG_REISERFS_FS_XATTR=n
- reiserfs-xattrs-disabled-perms: Fixes warnings on delete withCONFIG_REISERFS_FS_XATTR=n (bko#13122)- reiserfs-expose-privroot: Adds a -oexpose_privroot that will allow access to the privroot.
I rebooted into v2.6.30-rc5-96-ga4d7749 + these four patches now. Looks good so far.
Signature · 3 lines
Stefan Richter -=====-=-=== -=-= -==-= http://arcgraph.de/sr/
Re: [patch 3/4] reiserfs: fixup perms when xattrs are disabled
In reply to Jeff Mahoneyfs/reiserfs/xattr.c static int xattr_mount_check(struct supe · line 952
Quoted 9 lines · Jeff Mahoney
fs/reiserfs/xattr.c +9
-0+#ifdef CONFIG_REISERFS_FS_XATTR +/* +* Stat data v1 doesn't support ACLs. +*/ +if (get_inode_sd_version (inode) !=STAT_DATA_V1 ) +return generic_permission (inode, mask, reiserfs_check_acl); + else +#endif +return generic_permission (inode, mask,NULL );
Matter of style: this kind of mixing the nesting structures is Not Nice(tm), so I'd rather turn that into
+#ifdef CONFIG_REISERFS_FS_XATTR
+ /*
+ * Stat data v1 doesn't support ACLs.
+ */
+ if (get_inode_sd_version(inode) != STAT_DATA_V1)
+ return generic_permission(inode, mask, reiserfs_check_acl);
+#endif
+
+ return generic_permission(inode, mask, NULL);
Re: [patch 3/4] reiserfs: fixup perms when xattrs are disabled
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 15 lines · Al Viro
fs/reiserfs/xattr.c static int xattr_mount_check(struct supe · line 952
Quoted 9 lines · Jeff Mahoney
fs/reiserfs/xattr.c +9
-0+#ifdef CONFIG_REISERFS_FS_XATTR +/* +* Stat data v1 doesn't support ACLs. +*/ +if (get_inode_sd_version (inode) !=STAT_DATA_V1 ) +return generic_permission (inode, mask, reiserfs_check_acl); + else +#endif +return generic_permission (inode, mask,NULL );Matter of style: this kind of mixing the nesting structures is Not Nice(tm), so I'd rather turn that into
fs/reiserfs/xattr.c static int xattr_mount_check(struct supe
Quoted 9 lines
fs/reiserfs/xattr.c +9
-0+#ifdef CONFIG_REISERFS_FS_XATTR +/* +* Stat data v1 doesn't support ACLs. +*/ +if (get_inode_sd_version (inode) !=STAT_DATA_V1 ) +return generic_permission (inode, mask, reiserfs_check_acl); +#endif + +return generic_permission (inode, mask,NULL );
Works for me.
- -Jeff
- --
Jeff Mahoney
SUSE Labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iEYEARECAAYFAkoHYw4ACgkQLPWxlyuTD7JdrACfdMo7wPBtIGBadVEBKiviD4i9 H4oAoKf1GtugtaiTVZdwwveaTPxBRD/T
=JiZ1
-----END PGP SIGNATURE-----