diff options
| author | Alex Elder <aelder@sgi.com> | 2010-02-26 21:34:02 +0100 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-02-26 21:34:02 +0100 |
| commit | 398007f863a4af2b4a5a07219c5a617f1a098115 (patch) | |
| tree | 7589f17bfa6645ee0342048bfaede1391a411f2b /fs/ocfs2/ocfs2_fs.h | |
| parent | fs/xfs: Correct NULL test (diff) | |
| parent | Linux 2.6.33 (diff) | |
| download | linux-398007f863a4af2b4a5a07219c5a617f1a098115.tar.xz linux-398007f863a4af2b4a5a07219c5a617f1a098115.zip | |
Merge branch 'linux-2.6.33'
Diffstat (limited to 'fs/ocfs2/ocfs2_fs.h')
| -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 1a1a679e51b5..7638a38c32bc 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) |