diff options
| author | Tao Ma <tao.ma@oracle.com> | 2010-01-20 11:31:11 +0800 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-01-25 19:20:45 -0800 |
| commit | 1097df3ffe855eb1476496fa5394816fb197af05 (patch) | |
| tree | 89f1c5be559743e6dd768107a2b1afc329895e09 /fs/ocfs2 | |
| parent | 1dd473fdf1d8a7531e0955480cd129f9c1e8b8a3 (diff) | |
| download | linux-3.10-1097df3ffe855eb1476496fa5394816fb197af05.tar.gz linux-3.10-1097df3ffe855eb1476496fa5394816fb197af05.tar.bz2 linux-3.10-1097df3ffe855eb1476496fa5394816fb197af05.zip | |
ocfs2: Sync max_inline_data_with_xattr from tools.
In ocfs2-tools, we have added ocfs2_max_inline_data_with_xattr,
so add it in the kernel's ocfs2_fs.h.
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/ocfs2_fs.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index 1a1a679e51b..7638a38c32b 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h @@ -1417,9 +1417,16 @@ static inline int ocfs2_fast_symlink_chars(int blocksize) return blocksize - offsetof(struct ocfs2_dinode, id2.i_symlink); } -static inline int ocfs2_max_inline_data(int blocksize) +static inline int ocfs2_max_inline_data_with_xattr(int blocksize, + struct ocfs2_dinode *di) { - return blocksize - offsetof(struct ocfs2_dinode, id2.i_data.id_data); + if (di && (di->i_dyn_features & OCFS2_INLINE_XATTR_FL)) + return blocksize - + offsetof(struct ocfs2_dinode, id2.i_data.id_data) - + di->i_xattr_inline_size; + else + return blocksize - + offsetof(struct ocfs2_dinode, id2.i_data.id_data); } static inline int ocfs2_extent_recs_per_inode(int blocksize) |