The patch titled
Subject: hfsplus: fix expand when not enough available space
has been added to the -mm tree. Its filename is
hfsplus-fix-expand-when-not-enough-available-space.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/hfsplus-fix-expand-when-not-enough-available-space.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/hfsplus-fix-expand-when-not-enough-available-space.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Sergei Antonov <saproj@xxxxxxxxx>
Subject: hfsplus: fix expand when not enough available space
Fix a bug which is reproduced as follows. Create a file:
echo abc > test_file
Try to expand the file beyond available space:
truncate --size=<size exceeding available space> test_file
Since HFS+ does not support file size > allocated size, truncate should
fail. However, it ends successfully. The driver returns success despite
having been unable to allocate the requested space for the file. Also
filesystem check finds an error:
Checking catalog file.
Incorrect size for file test_file
(It should be 469094400 instead of 1000000000)
Add a piece of code analogous to code in the fat driver. Now a proper
error is returned and filesystem remains consistent.
Signed-off-by: Sergei Antonov <saproj@xxxxxxxxx>
Cc: Vyacheslav Dubeyko <slava@xxxxxxxxxxx>
Cc: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Anton Altaparmakov <anton@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Cc: Sougata Santra <sougata@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/hfsplus/inode.c | 6 ++++++
1 file changed, 6 insertions(+)
diff -puN fs/hfsplus/inode.c~hfsplus-fix-expand-when-not-enough-available-space fs/hfsplus/inode.c
--- a/fs/hfsplus/inode.c~hfsplus-fix-expand-when-not-enough-available-space
+++ a/fs/hfsplus/inode.c
@@ -254,6 +254,12 @@ static int hfsplus_setattr(struct dentry
if ((attr->ia_valid & ATTR_SIZE) &&
attr->ia_size != i_size_read(inode)) {
inode_dio_wait(inode);
+ if (attr->ia_size > inode->i_size) {
+ error = generic_cont_expand_simple(inode,
+ attr->ia_size);
+ if (error)
+ return error;
+ }
truncate_setsize(inode, attr->ia_size);
hfsplus_file_truncate(inode);
}
_
Patches currently in -mm which might be from saproj@xxxxxxxxx are
hfsplus-fix-b-tree-corruption-after-insertion-at-position-0.patch
hfsplus-incorrect-return-value.patch
hfsplus-fix-expand-when-not-enough-available-space.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
