aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ntfs/runlist.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2006-03-23 09:57:43 -0500
committerAnton Altaparmakov <aia21@cantab.net>2006-03-23 09:57:43 -0500
commit67b1dfe77a2eb2a88b37cd77b8979cbdb7695bd6 (patch)
tree95383ef7826a451dea08d58518219ce30b96880d /fs/ntfs/runlist.c
parentb4d8d1a93c6ea042b29bb66fbb1cf6bc556c18f7 (diff)
NTFS: Fix an (innocent) off-by-one error in the runlist code.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Diffstat (limited to 'fs/ntfs/runlist.c')
-rw-r--r--fs/ntfs/runlist.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/ntfs/runlist.c b/fs/ntfs/runlist.c
index 061b5ff6b73c..eb52b801512b 100644
--- a/fs/ntfs/runlist.c
+++ b/fs/ntfs/runlist.c
@@ -381,6 +381,7 @@ static inline runlist_element *ntfs_rl_insert(runlist_element *dst,
381static inline runlist_element *ntfs_rl_replace(runlist_element *dst, 381static inline runlist_element *ntfs_rl_replace(runlist_element *dst,
382 int dsize, runlist_element *src, int ssize, int loc) 382 int dsize, runlist_element *src, int ssize, int loc)
383{ 383{
384 signed delta;
384 BOOL left = FALSE; /* Left end of @src needs merging. */ 385 BOOL left = FALSE; /* Left end of @src needs merging. */
385 BOOL right = FALSE; /* Right end of @src needs merging. */ 386 BOOL right = FALSE; /* Right end of @src needs merging. */
386 int tail; /* Start of tail of @dst. */ 387 int tail; /* Start of tail of @dst. */
@@ -396,11 +397,14 @@ static inline runlist_element *ntfs_rl_replace(runlist_element *dst,
396 left = ntfs_are_rl_mergeable(dst + loc - 1, src); 397 left = ntfs_are_rl_mergeable(dst + loc - 1, src);
397 /* 398 /*
398 * Allocate some space. We will need less if the left, right, or both 399 * Allocate some space. We will need less if the left, right, or both
399 * ends get merged. 400 * ends get merged. The -1 accounts for the run being replaced.
400 */ 401 */
401 dst = ntfs_rl_realloc(dst, dsize, dsize + ssize - left - right); 402 delta = ssize - 1 - left - right;
402 if (IS_ERR(dst)) 403 if (delta > 0) {
403 return dst; 404 dst = ntfs_rl_realloc(dst, dsize, dsize + delta);
405 if (IS_ERR(dst))
406 return dst;
407 }
404 /* 408 /*
405 * We are guaranteed to succeed from here so can start modifying the 409 * We are guaranteed to succeed from here so can start modifying the
406 * original runlists. 410 * original runlists.