diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-27 18:54:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-27 18:54:17 -0800 |
| commit | a531a141089714efe39eca89593524fdf05104f2 (patch) | |
| tree | f858a5d7c11f5da8d00473ed7b176540e2243bdf /fs/ocfs2/aops.c | |
| parent | 5e6ddf9aaa0f2b16fc503626c70bb19832b22b8b (diff) | |
| parent | b1967d0eddeef4869ee283e692735cb994f3745a (diff) | |
| download | op-kernel-dev-a531a141089714efe39eca89593524fdf05104f2.zip op-kernel-dev-a531a141089714efe39eca89593524fdf05104f2.tar.gz | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: reverse inline-data truncate args
ocfs2: Fix comparison in ocfs2_size_fits_inline_data()
ocfs2: Remove bug statement in ocfs2_dentry_iput()
[PATCH] ocfs2: Remove expensive bitmap scanning
ocfs2: log valid inode # on bad inode
ocfs2: Filter -ENOSPC in mlog_errno()
[PATCH] fs/ocfs2: Add missing "space"
ocfs2: Reset journal parameters after s_mount_opt update
Diffstat (limited to 'fs/ocfs2/aops.c')
| -rw-r--r-- | fs/ocfs2/aops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 556e34c..56f7790 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -1514,7 +1514,7 @@ int ocfs2_size_fits_inline_data(struct buffer_head *di_bh, u64 new_size) { struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data; - if (new_size < le16_to_cpu(di->id2.i_data.id_count)) + if (new_size <= le16_to_cpu(di->id2.i_data.id_count)) return 1; return 0; } |
