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

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

ocfs2: fix function declaration and definition in xattr 



Because we merged the xattr sources into one file, some functions
no longer belong in the header file.

Signed-off-by: default avatarTiger Yang <tiger.yang@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent c3cb6827

fs/ocfs2/xattr.c

+23 −5
Original line number Diff line number Diff line
@@ -132,6 +132,24 @@ static int ocfs2_xattr_set_entry_index_block(struct inode *inode, 
static int ocfs2_delete_xattr_index_block(struct inode *inode,

					  struct buffer_head *xb_bh);



static inline u16 ocfs2_xattr_buckets_per_cluster(struct ocfs2_super *osb)

{

	return (1 << osb->s_clustersize_bits) / OCFS2_XATTR_BUCKET_SIZE;

}



static inline u16 ocfs2_blocks_per_xattr_bucket(struct super_block *sb)

{

	return OCFS2_XATTR_BUCKET_SIZE / (1 << sb->s_blocksize_bits);

}



static inline u16 ocfs2_xattr_max_xe_in_bucket(struct super_block *sb)

{

	u16 len = sb->s_blocksize -

		 offsetof(struct ocfs2_xattr_header, xh_entries);



	return len / sizeof(struct ocfs2_xattr_entry);

}



static inline const char *ocfs2_xattr_prefix(int name_index)

{

	struct xattr_handler *handler = NULL;
@@ -832,7 +850,7 @@ static int ocfs2_xattr_block_get(struct inode *inode, 
 * Copy an extended attribute into the buffer provided.

 * Buffer is NULL to compute the size of buffer required.

 */

int ocfs2_xattr_get(struct inode *inode,

static int ocfs2_xattr_get(struct inode *inode,

			   int name_index,

			   const char *name,

			   void *buffer,

fs/ocfs2/xattr.h

+4 −22
Original line number Diff line number Diff line
@@ -32,29 +32,11 @@ enum ocfs2_xattr_type { 


extern struct xattr_handler ocfs2_xattr_user_handler;

extern struct xattr_handler ocfs2_xattr_trusted_handler;



extern ssize_t ocfs2_listxattr(struct dentry *, char *, size_t);

extern int ocfs2_xattr_get(struct inode *, int, const char *, void *, size_t);

extern int ocfs2_xattr_set(struct inode *, int, const char *, const void *,

			   size_t, int);

extern int ocfs2_xattr_remove(struct inode *inode, struct buffer_head *di_bh);

extern struct xattr_handler *ocfs2_xattr_handlers[];



static inline u16 ocfs2_xattr_buckets_per_cluster(struct ocfs2_super *osb)

{

	return (1 << osb->s_clustersize_bits) / OCFS2_XATTR_BUCKET_SIZE;

}



static inline u16 ocfs2_blocks_per_xattr_bucket(struct super_block *sb)

{

	return OCFS2_XATTR_BUCKET_SIZE / (1 << sb->s_blocksize_bits);

}



static inline u16 ocfs2_xattr_max_xe_in_bucket(struct super_block *sb)

{

	u16 len = sb->s_blocksize -

		 offsetof(struct ocfs2_xattr_header, xh_entries);

ssize_t ocfs2_listxattr(struct dentry *, char *, size_t);

int ocfs2_xattr_set(struct inode *, int, const char *, const void *,

		    size_t, int);

int ocfs2_xattr_remove(struct inode *, struct buffer_head *);



	return len / sizeof(struct ocfs2_xattr_entry);

}

#endif /* OCFS2_XATTR_H */