evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

f2fs: kill F2FS_INLINE_XATTR_ADDRS for cleanup

Browse source 
Use get_inline_xattr_addrs directly instead of F2FS_INLINE_XATTR_ADDRS.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2018-01-17 16:31:36 +08:00 • committed by Jaegeuk Kim
parent c1b74c9670
commit eeb0118b83
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/f2fs/data.c
View file

@ -1200,7 +1200,7 @@ static int f2fs_xattr_fiemap(struct inode *inode,
phys = (__u64)blk_to_logical(inode, ni.blk_addr); phys = (__u64)blk_to_logical(inode, ni.blk_addr);
offset = offsetof(struct f2fs_inode, i_addr) + offset = offsetof(struct f2fs_inode, i_addr) +
sizeof(__le32) * (DEF_ADDRS_PER_INODE - sizeof(__le32) * (DEF_ADDRS_PER_INODE -
F2FS_INLINE_XATTR_ADDRS(inode)); get_inline_xattr_addrs(inode));
phys += offset; phys += offset;
len = inline_xattr_size(inode); len = inline_xattr_size(inode);

7
fs/f2fs/f2fs.h
View file

@ -478,10 +478,9 @@ struct f2fs_flush_device {
#define DEF_MIN_INLINE_SIZE 1 #define DEF_MIN_INLINE_SIZE 1
static inline int get_extra_isize(struct inode *inode); static inline int get_extra_isize(struct inode *inode);
static inline int get_inline_xattr_addrs(struct inode *inode); static inline int get_inline_xattr_addrs(struct inode *inode);
#define F2FS_INLINE_XATTR_ADDRS(inode) get_inline_xattr_addrs(inode)
#define MAX_INLINE_DATA(inode) (sizeof(__le32) * \ #define MAX_INLINE_DATA(inode) (sizeof(__le32) * \
(CUR_ADDRS_PER_INODE(inode) - \ (CUR_ADDRS_PER_INODE(inode) - \
F2FS_INLINE_XATTR_ADDRS(inode) - \ get_inline_xattr_addrs(inode) - \
DEF_INLINE_RESERVED_SIZE)) DEF_INLINE_RESERVED_SIZE))
/* for inline dir */ /* for inline dir */
@ -2388,7 +2387,7 @@ static inline int f2fs_has_inline_xattr(struct inode *inode)
static inline unsigned int addrs_per_inode(struct inode *inode) static inline unsigned int addrs_per_inode(struct inode *inode)
{ {
return CUR_ADDRS_PER_INODE(inode) - F2FS_INLINE_XATTR_ADDRS(inode); return CUR_ADDRS_PER_INODE(inode) - get_inline_xattr_addrs(inode);
} }
static inline void *inline_xattr_addr(struct inode *inode, struct page *page) static inline void *inline_xattr_addr(struct inode *inode, struct page *page)
@ -2396,7 +2395,7 @@ static inline void *inline_xattr_addr(struct inode *inode, struct page *page)
struct f2fs_inode *ri = F2FS_INODE(page); struct f2fs_inode *ri = F2FS_INODE(page);
return (void *)&(ri->i_addr[DEF_ADDRS_PER_INODE - return (void *)&(ri->i_addr[DEF_ADDRS_PER_INODE -
F2FS_INLINE_XATTR_ADDRS(inode)]); get_inline_xattr_addrs(inode)]);
} }
static inline int inline_xattr_size(struct inode *inode) static inline int inline_xattr_size(struct inode *inode)