aboutsummaryrefslogtreecommitdiffstats
path: root/fs/udf/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/udf/super.c')
-rw-r--r--fs/udf/super.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 81b8adc86745..627558213746 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -820,7 +820,7 @@ static int udf_find_fileset(struct super_block *sb,
820 820
821 if (fileset->logicalBlockNum != 0xFFFFFFFF || 821 if (fileset->logicalBlockNum != 0xFFFFFFFF ||
822 fileset->partitionReferenceNum != 0xFFFF) { 822 fileset->partitionReferenceNum != 0xFFFF) {
823 bh = udf_read_ptagged(sb, *fileset, 0, &ident); 823 bh = udf_read_ptagged(sb, fileset, 0, &ident);
824 824
825 if (!bh) { 825 if (!bh) {
826 return 1; 826 return 1;
@@ -850,7 +850,7 @@ static int udf_find_fileset(struct super_block *sb,
850 newfileset.logicalBlockNum = 0; 850 newfileset.logicalBlockNum = 0;
851 851
852 do { 852 do {
853 bh = udf_read_ptagged(sb, newfileset, 0, 853 bh = udf_read_ptagged(sb, &newfileset, 0,
854 &ident); 854 &ident);
855 if (!bh) { 855 if (!bh) {
856 newfileset.logicalBlockNum++; 856 newfileset.logicalBlockNum++;
@@ -959,7 +959,7 @@ static int udf_load_metadata_files(struct super_block *sb, int partition)
959 udf_debug("Metadata file location: block = %d part = %d\n", 959 udf_debug("Metadata file location: block = %d part = %d\n",
960 addr.logicalBlockNum, addr.partitionReferenceNum); 960 addr.logicalBlockNum, addr.partitionReferenceNum);
961 961
962 mdata->s_metadata_fe = udf_iget(sb, addr); 962 mdata->s_metadata_fe = udf_iget(sb, &addr);
963 963
964 if (mdata->s_metadata_fe == NULL) { 964 if (mdata->s_metadata_fe == NULL) {
965 udf_warning(sb, __func__, "metadata inode efe not found, " 965 udf_warning(sb, __func__, "metadata inode efe not found, "
@@ -981,7 +981,7 @@ static int udf_load_metadata_files(struct super_block *sb, int partition)
981 udf_debug("Mirror metadata file location: block = %d part = %d\n", 981 udf_debug("Mirror metadata file location: block = %d part = %d\n",
982 addr.logicalBlockNum, addr.partitionReferenceNum); 982 addr.logicalBlockNum, addr.partitionReferenceNum);
983 983
984 mdata->s_mirror_fe = udf_iget(sb, addr); 984 mdata->s_mirror_fe = udf_iget(sb, &addr);
985 985
986 if (mdata->s_mirror_fe == NULL) { 986 if (mdata->s_mirror_fe == NULL) {
987 if (fe_error) { 987 if (fe_error) {
@@ -1013,7 +1013,7 @@ static int udf_load_metadata_files(struct super_block *sb, int partition)
1013 udf_debug("Bitmap file location: block = %d part = %d\n", 1013 udf_debug("Bitmap file location: block = %d part = %d\n",
1014 addr.logicalBlockNum, addr.partitionReferenceNum); 1014 addr.logicalBlockNum, addr.partitionReferenceNum);
1015 1015
1016 mdata->s_bitmap_fe = udf_iget(sb, addr); 1016 mdata->s_bitmap_fe = udf_iget(sb, &addr);
1017 1017
1018 if (mdata->s_bitmap_fe == NULL) { 1018 if (mdata->s_bitmap_fe == NULL) {
1019 if (sb->s_flags & MS_RDONLY) 1019 if (sb->s_flags & MS_RDONLY)
@@ -1125,7 +1125,7 @@ static int udf_fill_partdesc_info(struct super_block *sb,
1125 .partitionReferenceNum = p_index, 1125 .partitionReferenceNum = p_index,
1126 }; 1126 };
1127 1127
1128 map->s_uspace.s_table = udf_iget(sb, loc); 1128 map->s_uspace.s_table = udf_iget(sb, &loc);
1129 if (!map->s_uspace.s_table) { 1129 if (!map->s_uspace.s_table) {
1130 udf_debug("cannot load unallocSpaceTable (part %d)\n", 1130 udf_debug("cannot load unallocSpaceTable (part %d)\n",
1131 p_index); 1131 p_index);
@@ -1160,7 +1160,7 @@ static int udf_fill_partdesc_info(struct super_block *sb,
1160 .partitionReferenceNum = p_index, 1160 .partitionReferenceNum = p_index,
1161 }; 1161 };
1162 1162
1163 map->s_fspace.s_table = udf_iget(sb, loc); 1163 map->s_fspace.s_table = udf_iget(sb, &loc);
1164 if (!map->s_fspace.s_table) { 1164 if (!map->s_fspace.s_table) {
1165 udf_debug("cannot load freedSpaceTable (part %d)\n", 1165 udf_debug("cannot load freedSpaceTable (part %d)\n",
1166 p_index); 1166 p_index);
@@ -1201,7 +1201,7 @@ static int udf_load_vat(struct super_block *sb, int p_index, int type1_index)
1201 /* VAT file entry is in the last recorded block */ 1201 /* VAT file entry is in the last recorded block */
1202 ino.partitionReferenceNum = type1_index; 1202 ino.partitionReferenceNum = type1_index;
1203 ino.logicalBlockNum = sbi->s_last_block - map->s_partition_root; 1203 ino.logicalBlockNum = sbi->s_last_block - map->s_partition_root;
1204 sbi->s_vat_inode = udf_iget(sb, ino); 1204 sbi->s_vat_inode = udf_iget(sb, &ino);
1205 if (!sbi->s_vat_inode) 1205 if (!sbi->s_vat_inode)
1206 return 1; 1206 return 1;
1207 1207
@@ -1991,7 +1991,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
1991 /* Assign the root inode */ 1991 /* Assign the root inode */
1992 /* assign inodes by physical block number */ 1992 /* assign inodes by physical block number */
1993 /* perhaps it's not extensible enough, but for now ... */ 1993 /* perhaps it's not extensible enough, but for now ... */
1994 inode = udf_iget(sb, rootdir); 1994 inode = udf_iget(sb, &rootdir);
1995 if (!inode) { 1995 if (!inode) {
1996 printk(KERN_ERR "UDF-fs: Error in udf_iget, block=%d, " 1996 printk(KERN_ERR "UDF-fs: Error in udf_iget, block=%d, "
1997 "partition=%d\n", 1997 "partition=%d\n",
@@ -2124,7 +2124,7 @@ static unsigned int udf_count_free_bitmap(struct super_block *sb,
2124 2124
2125 loc.logicalBlockNum = bitmap->s_extPosition; 2125 loc.logicalBlockNum = bitmap->s_extPosition;
2126 loc.partitionReferenceNum = UDF_SB(sb)->s_partition; 2126 loc.partitionReferenceNum = UDF_SB(sb)->s_partition;
2127 bh = udf_read_ptagged(sb, loc, 0, &ident); 2127 bh = udf_read_ptagged(sb, &loc, 0, &ident);
2128 2128
2129 if (!bh) { 2129 if (!bh) {
2130 printk(KERN_ERR "udf: udf_count_free failed\n"); 2130 printk(KERN_ERR "udf: udf_count_free failed\n");
@@ -2147,7 +2147,7 @@ static unsigned int udf_count_free_bitmap(struct super_block *sb,
2147 bytes -= cur_bytes; 2147 bytes -= cur_bytes;
2148 if (bytes) { 2148 if (bytes) {
2149 brelse(bh); 2149 brelse(bh);
2150 newblock = udf_get_lb_pblock(sb, loc, ++block); 2150 newblock = udf_get_lb_pblock(sb, &loc, ++block);
2151 bh = udf_tread(sb, newblock); 2151 bh = udf_tread(sb, newblock);
2152 if (!bh) { 2152 if (!bh) {
2153 udf_debug("read failed\n"); 2153 udf_debug("read failed\n");