aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2008-02-08 07:20:33 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:35 -0500
commitdeae6cfcdc206f68e89346295909a2629f0e0606 (patch)
tree0977ed754a1f1be8802e6f5541208ea0fe4b39fa /fs
parentdc5d39be6dfb54a50c8ee1f6154b10181c974db1 (diff)
udf: check if udf_load_logicalvol failed
udf_load_logicalvol may fail eg in out of memory conditions - check it and propagate error further Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Ben Fennema <bfennema@falcon.csc.calpoly.edu> Acked-by: Jan Kara <jack@suse.cz> Cc: Christoph Hellwig <hch@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/udf/super.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 4d1e197164b7..913ece8eec61 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1263,7 +1263,10 @@ static int udf_process_sequence(struct super_block *sb, long block,
1263 if (i == VDS_POS_PRIMARY_VOL_DESC) { 1263 if (i == VDS_POS_PRIMARY_VOL_DESC) {
1264 udf_load_pvoldesc(sb, bh); 1264 udf_load_pvoldesc(sb, bh);
1265 } else if (i == VDS_POS_LOGICAL_VOL_DESC) { 1265 } else if (i == VDS_POS_LOGICAL_VOL_DESC) {
1266 udf_load_logicalvol(sb, bh, fileset); /* TODO: check return value */ 1266 if (udf_load_logicalvol(sb, bh, fileset)) {
1267 brelse(bh);
1268 return 1;
1269 }
1267 } else if (i == VDS_POS_PARTITION_DESC) { 1270 } else if (i == VDS_POS_PARTITION_DESC) {
1268 struct buffer_head *bh2 = NULL; 1271 struct buffer_head *bh2 = NULL;
1269 if (udf_load_partdesc(sb, bh)) { 1272 if (udf_load_partdesc(sb, bh)) {