diff options
author | Brian Foster <bfoster@redhat.com> | 2013-02-22 13:32:56 -0500 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2013-03-18 13:30:38 -0500 |
commit | 83cdadd8b0559c93728d065d23ca3485fa567e54 (patch) | |
tree | 1d780da1a8a49c9eed1d390b92ece519f1fe9c3f /fs | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
download | op-kernel-dev-83cdadd8b0559c93728d065d23ca3485fa567e54.zip op-kernel-dev-83cdadd8b0559c93728d065d23ca3485fa567e54.tar.gz |
xfs: fix potential infinite loop in xfs_iomap_prealloc_size()
If freesp == 0, we could end up in an infinite loop while squashing
the preallocation. Break the loop when we've killed the prealloc
entirely.
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
(cherry picked from commit e78c420bfc2608bb5f9a0b9165b1071c1e31166a)
Diffstat (limited to 'fs')
-rw-r--r-- | fs/xfs/xfs_iomap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 912d83d..b0b0f44 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -413,7 +413,7 @@ xfs_iomap_prealloc_size( * have a large file on a small filesystem and the above * lowspace thresholds are smaller than MAXEXTLEN. */ - while (alloc_blocks >= freesp) + while (alloc_blocks && alloc_blocks >= freesp) alloc_blocks >>= 4; } |