| Message ID | 20180102103520.865665-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | ocfs: fix fall-back-to-buffer-io-when-append-dio-is-disabled-with-file-hole-existing-fix | expand |
Hi Arnd,
On 2018/1/2 18:34, Arnd Bergmann wrote:
> Fixes: mmotm ("ocfs2-fall-back-to-buffer-io-when-append-dio-is-disabled-with-file-hole-existing-fix")
I think this patch is not fit for mainline and will not be apply to mainline in the future.
Andrew can remove it from mm-tree.
Thanks,
Alex
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 87562112cb5e..8aa2519a0966 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -2432,10 +2432,11 @@ static bool ocfs2_range_has_holes(struct inode *inode, loff_t pos, size_t count) clusters = ocfs2_clusters_for_bytes(sb, pos + count) - cpos; while (clusters) { - ret = ocfs2_get_clusters(inode, cpos, &phys_cpos, &extent_len, - &extent_flags); - if (ret < 0) { - mlog_errno(ret); + int err = ocfs2_get_clusters(inode, cpos, &phys_cpos, + &extent_len, &extent_flags); + if (err < 0) { + mlog_errno(err); + ret = true; goto out; }
The 'ret' variable is used to store the integer return value of ocfs2_get_clusters(), as shown by this warning from modern compilers: fs/ocfs2/aops.c: In function 'ocfs2_range_has_holes': fs/ocfs2/aops.c:2437:11: error: comparison of constant '0' with boolean expression is always false [-Werror=bool-compare] Fixes: mmotm ("ocfs2-fall-back-to-buffer-io-when-append-dio-is-disabled-with-file-hole-existing-fix") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- fs/ocfs2/aops.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.9.0