Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf1d6c76 authored by Tiger Yang's avatar Tiger Yang Committed by Mark Fasheh
Browse files

ocfs2: Add extended attribute support 



This patch implements storing extended attributes both in inode or a single
external block. We only store EA's in-inode when blocksize > 512 or that
inode block has free space for it. When an EA's value is larger than 80
bytes, we will store the value via b-tree outside inode or block.

Signed-off-by: default avatarTiger Yang <tiger.yang@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent fdd77704

fs/ocfs2/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ ocfs2-objs := \ 
	uptodate.o		\

	ver.o			\

	xattr.o			\

	xattr_user.o		\

	xattr_trusted.o



ocfs2_stackglue-objs := stackglue.o

ocfs2_stack_o2cb-objs := stack_o2cb.o

fs/ocfs2/file.c

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include "mmap.h"

#include "suballoc.h"

#include "super.h"

#include "xattr.h"



#include "buffer_head_io.h"
@@ -2070,6 +2071,10 @@ const struct inode_operations ocfs2_file_iops = { 
	.setattr	= ocfs2_setattr,

	.getattr	= ocfs2_getattr,

	.permission	= ocfs2_permission,

	.setxattr	= generic_setxattr,

	.getxattr	= generic_getxattr,

	.listxattr	= ocfs2_listxattr,

	.removexattr	= generic_removexattr,

	.fallocate	= ocfs2_fallocate,

	.fiemap		= ocfs2_fiemap,

};

fs/ocfs2/inode.c

+8 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include "symlink.h"

#include "sysfile.h"

#include "uptodate.h"

#include "xattr.h"



#include "buffer_head_io.h"
@@ -741,6 +742,13 @@ static int ocfs2_wipe_inode(struct inode *inode, 
		goto bail_unlock_dir;

	}



	/*Free extended attribute resources associated with this inode.*/

	status = ocfs2_xattr_remove(inode, di_bh);

	if (status < 0) {

		mlog_errno(status);

		goto bail_unlock_dir;

	}



	status = ocfs2_remove_inode(inode, di_bh, orphan_dir_inode,

				    orphan_dir_bh);

	if (status < 0)

fs/ocfs2/inode.h

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ struct ocfs2_inode_info 
	/* protects allocation changes on this inode. */

	struct rw_semaphore		ip_alloc_sem;



	/* protects extended attribute changes on this inode */

	struct rw_semaphore		ip_xattr_sem;



	/* These fields are protected by ip_lock */

	spinlock_t			ip_lock;

	u32				ip_open_count;

fs/ocfs2/journal.h

+10 −0
Original line number Diff line number Diff line
@@ -283,6 +283,9 @@ int ocfs2_journal_dirty_data(handle_t *handle, 
/* simple file updates like chmod, etc. */

#define OCFS2_INODE_UPDATE_CREDITS 1



/* extended attribute block update */

#define OCFS2_XATTR_BLOCK_UPDATE_CREDITS 1



/* group extend. inode update and last group update. */

#define OCFS2_GROUP_EXTEND_CREDITS	(OCFS2_INODE_UPDATE_CREDITS + 1)
@@ -340,6 +343,13 @@ int ocfs2_journal_dirty_data(handle_t *handle, 
#define OCFS2_RENAME_CREDITS (3 * OCFS2_INODE_UPDATE_CREDITS + 3              \

			     + OCFS2_UNLINK_CREDITS)



/* global bitmap dinode, group desc., relinked group,

 * suballocator dinode, group desc., relinked group,

 * dinode, xattr block */

#define OCFS2_XATTR_BLOCK_CREATE_CREDITS (OCFS2_SUBALLOC_ALLOC * 2 + \

					  + OCFS2_INODE_UPDATE_CREDITS \

					  + OCFS2_XATTR_BLOCK_UPDATE_CREDITS)



/*

 * Please note that the caller must make sure that root_el is the root

 * of extent tree. So for an inode, it should be &fe->id2.i_list. Otherwise