Quellcode durchsuchen

GFS2: Fix bmap allocation corner-case bug

This patch solves a corner case during allocation which occurs if both
metadata (indirect) and data blocks are required but there is an
obstacle in the filesystem (e.g. a resource group header or another
allocated block) such that when the allocation is requested only
enough blocks for the metadata are returned.

By changing the exit condition of this loop, we ensure that a
minimum of one data block will always be returned.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Steven Whitehouse vor 15 Jahren
Ursprung
Commit
07ccb7bf2c
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
  1. 1 1
      fs/gfs2/bmap.c

+ 1 - 1
fs/gfs2/bmap.c

@@ -541,7 +541,7 @@ static int gfs2_bmap_alloc(struct inode *inode, const sector_t lblock,
 				*ptr++ = cpu_to_be64(bn++);
 				*ptr++ = cpu_to_be64(bn++);
 			break;
 			break;
 		}
 		}
-	} while (state != ALLOC_DATA);
+	} while ((state != ALLOC_DATA) || !dblock);
 
 
 	ip->i_height = height;
 	ip->i_height = height;
 	gfs2_add_inode_blocks(&ip->i_inode, alloced);
 	gfs2_add_inode_blocks(&ip->i_inode, alloced);