Hi,
  the patch below makes UDF compile in -mm kernel (against 2.6.24-rc8-mm1).

Please apply.
									Honza

--

Jan Kara <jack@suse.cz>

SUSE Labs, CR

---
Make UDF compile - fixes fallout from previous cleanup patches.
Signed-off-by: Jan Kara <jack@suse.cz>
diff -rupX /home/jack/.kerndiffexclude linux-2.6.24-rc8-mm1-1-udf_fpos_fix/fs/udf/ialloc.c linux-2.6.24-rc8-mm1-2-udf_add_entry_fix/fs/udf/ialloc.c

--- linux-2.6.24-rc8-mm1-1-udf_fpos_fix/fs/udf/ialloc.c	2008-01-29 19:20:40.000000000 +0100

+++ linux-2.6.24-rc8-mm1-2-udf_add_entry_fix/fs/udf/ialloc.c	2008-01-29 21:44:14.000000000 +0100

@@ -128,37 +128,39 @@ struct inode *udf_new_inode(struct inode

 		inode->i_gid = current->fsgid;

 	}
-	UDF_I_LOCATION(inode).logicalBlockNum = block;

-	UDF_I_LOCATION(inode).partitionReferenceNum = UDF_I_LOCATION(dir).partitionReferenceNum;

-	inode->i_ino = udf_get_lb_pblock(sb, UDF_I_LOCATION(inode), 0);

+	iinfo->i_location.logicalBlockNum = block;

+	iinfo->i_location.partitionReferenceNum =

+			dinfo->i_location.partitionReferenceNum;

+	inode->i_ino = udf_get_lb_pblock(sb, iinfo->i_location, 0);

 	if (inode->i_ino == 2094)

 		printk(KERN_ERR "Allocated inode inode 2094\n");

 	inode->i_blocks = 0;

-	UDF_I_LENEATTR(inode) = 0;

-	UDF_I_LENALLOC(inode) = 0;

-	UDF_I_USE(inode) = 0;

+	iinfo->i_lenEAttr = 0;

+	iinfo->i_lenAlloc = 0;

+	iinfo->i_use = 0;

 	if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE)) {

-		UDF_I_EFE(inode) = 1;

-		UDF_UPDATE_UDFREV(inode->i_sb, UDF_VERS_USE_EXTENDED_FE);

-		UDF_I_DATA(inode) = kzalloc(inode->i_sb->s_blocksize - sizeof(struct extendedFileEntry), GFP_KERNEL);

+		iinfo->i_efe = 1;

+		if (UDF_VERS_USE_EXTENDED_FE > sbi->s_udfrev)

+			sbi->s_udfrev = UDF_VERS_USE_EXTENDED_FE;

+		iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize - sizeof(struct extendedFileEntry), GFP_KERNEL);

 	} else {

-		UDF_I_EFE(inode) = 0;

-		UDF_I_DATA(inode) = kzalloc(inode->...
[ message continues ]

On Wed, 30 Jan 2008 16:07:37 +0100
Please prefer to put not-for-the-changelog text after the "^---" rather

than prior to the changelog.
When fixing compile errors and warnings, please always quote the compiler

output so we can see what is being fixed.
This patch doesn't apply to my tree and UDF presently compiles OK.  And it

compiled OK in 2.6.24-rc8-mm1 so I am at a loss to know what's going on

here.
Please check http://userweb.kernel.org/~akpm/mmotm/ with your mysteryconfig

and see if we still need any fixes.   Beware that this mmotm snapshot is full

of git conflicts which I haven't bothered fixing (because they're different each

time I pull the trees).  But UDF compiles OK.
--