Commit a72bdb1c authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds
Browse files

reiserfs: Clean up xattrs when REISERFS_FS_XATTR is unset 



The current reiserfs xattr implementation will not clean up old xattr
files if files are deleted when REISERFS_FS_XATTR is unset.  This
results in inaccessible lost files, wasting space.

This patch compiles in basic xattr knowledge, such as how to delete them
and change ownership for quota tracking.  If the file system has never
used xattrs, then the operation is quite fast: it returns immediately
when it sees there is no .reiserfs_priv directory.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6dfede69

fs/reiserfs/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ obj-$(CONFIG_REISERFS_FS) += reiserfs.o 
reiserfs-objs := bitmap.o do_balan.o namei.o inode.o file.o dir.o fix_node.o \

		 super.o prints.o objectid.o lbalance.o ibalance.o stree.o \

		 hashes.o tail_conversion.o journal.o resize.o \

		 item_ops.o ioctl.o procfs.o

		 item_ops.o ioctl.o procfs.o xattr.o



ifeq ($(CONFIG_REISERFS_FS_XATTR),y)

reiserfs-objs += xattr.o xattr_user.o xattr_trusted.o

reiserfs-objs += xattr_user.o xattr_trusted.o

endif



ifeq ($(CONFIG_REISERFS_FS_SECURITY),y)

fs/reiserfs/xattr.c

+414 −387

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/reiserfs_fs_sb.h

+1 −1
Original line number Diff line number Diff line
@@ -402,8 +402,8 @@ struct reiserfs_sb_info { 
	int reserved_blocks;	/* amount of blocks reserved for further allocations */

	spinlock_t bitmap_lock;	/* this lock on now only used to protect reserved_blocks variable */

	struct dentry *priv_root;	/* root of /.reiserfs_priv */

#ifdef CONFIG_REISERFS_FS_XATTR

	struct dentry *xattr_root;	/* root of /.reiserfs_priv/.xa */

#ifdef CONFIG_REISERFS_FS_XATTR

	struct rw_semaphore xattr_dir_sem;

#endif

	int j_errno;

include/linux/reiserfs_xattr.h

+6 −23
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ struct reiserfs_xattr_handler { 
	struct list_head handlers;

};



int reiserfs_xattr_register_handlers(void) __init;

void reiserfs_xattr_unregister_handlers(void);

int reiserfs_xattr_init(struct super_block *sb, int mount_flags);

int reiserfs_delete_xattrs(struct inode *inode);

int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs);



#ifdef CONFIG_REISERFS_FS_XATTR

#define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)

ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name,
@@ -51,9 +57,6 @@ int reiserfs_setxattr(struct dentry *dentry, const char *name, 
		      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_delete_xattrs(struct inode *inode);

int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs);

int reiserfs_xattr_init(struct super_block *sb, int mount_flags);

int reiserfs_permission(struct inode *inode, int mask);



int reiserfs_xattr_del(struct inode *, const char *);
@@ -64,9 +67,6 @@ extern struct reiserfs_xattr_handler user_handler; 
extern struct reiserfs_xattr_handler trusted_handler;

extern struct reiserfs_xattr_handler security_handler;



int reiserfs_xattr_register_handlers(void) __init;

void reiserfs_xattr_unregister_handlers(void);



static inline void reiserfs_write_lock_xattrs(struct super_block *sb)

{

	down_write(&REISERFS_XATTR_DIR_SEM(sb));
@@ -121,23 +121,6 @@ static inline void reiserfs_init_xattr_rwsem(struct inode *inode) 


#define reiserfs_permission NULL



#define reiserfs_xattr_register_handlers() 0

#define reiserfs_xattr_unregister_handlers()



static inline int reiserfs_delete_xattrs(struct inode *inode)

{

	return 0;

};

static inline int reiserfs_chown_xattrs(struct inode *inode,

					struct iattr *attrs)

{

	return 0;

};

static inline int reiserfs_xattr_init(struct super_block *sb, int mount_flags)

{

	sb->s_flags = (sb->s_flags & ~MS_POSIXACL);	/* to be sure */

	return 0;

};

static inline void reiserfs_init_xattr_rwsem(struct inode *inode)

{

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE