diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/udf | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index b564fc140fe4..9fb18a340fc1 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
| @@ -240,7 +240,7 @@ static int udf_sb_alloc_partition_maps(struct super_block *sb, u32 count) | |||
| 240 | sbi->s_partmaps = kcalloc(count, sizeof(struct udf_part_map), | 240 | sbi->s_partmaps = kcalloc(count, sizeof(struct udf_part_map), |
| 241 | GFP_KERNEL); | 241 | GFP_KERNEL); |
| 242 | if (!sbi->s_partmaps) { | 242 | if (!sbi->s_partmaps) { |
| 243 | udf_error(sb, __FUNCTION__, | 243 | udf_error(sb, __func__, |
| 244 | "Unable to allocate space for %d partition maps", | 244 | "Unable to allocate space for %d partition maps", |
| 245 | count); | 245 | count); |
| 246 | sbi->s_partitions = 0; | 246 | sbi->s_partitions = 0; |
| @@ -1086,7 +1086,7 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index) | |||
| 1086 | bitmap = vmalloc(size); /* TODO: get rid of vmalloc */ | 1086 | bitmap = vmalloc(size); /* TODO: get rid of vmalloc */ |
| 1087 | 1087 | ||
| 1088 | if (bitmap == NULL) { | 1088 | if (bitmap == NULL) { |
| 1089 | udf_error(sb, __FUNCTION__, | 1089 | udf_error(sb, __func__, |
| 1090 | "Unable to allocate space for bitmap " | 1090 | "Unable to allocate space for bitmap " |
| 1091 | "and %d buffer_head pointers", nr_groups); | 1091 | "and %d buffer_head pointers", nr_groups); |
| 1092 | return NULL; | 1092 | return NULL; |