+@@ -1357,7 +1361,7 @@ static int ext3_check_descriptors (struc
+ return 0;
+ }
+ if (!ext3_group_desc_csum_verify(sbi, i, gdp)) {
+- ext3_error(sb, __FUNCTION__,
++ ext3_error(sb, __func__,
+ "Checksum for group %d failed (%u!=%u)\n", i,
+ le16_to_cpu(ext3_group_desc_csum(sbi,i,gdp)),
+ le16_to_cpu(gdp->bg_checksum));
+@@ -1446,7 +1450,7 @@ static void ext3_orphan_cleanup (struct
+ if (inode->i_nlink) {
+ printk(KERN_DEBUG
+ "%s: truncating inode %ld to %Ld bytes\n",
+- __FUNCTION__, inode->i_ino, inode->i_size);
++ __func__, inode->i_ino, inode->i_size);
+ jbd_debug(2, "truncating inode %ld to %Ld bytes\n",
+ inode->i_ino, inode->i_size);
+ ext3_truncate(inode);
+@@ -1454,7 +1458,7 @@ static void ext3_orphan_cleanup (struct
+ } else {
+ printk(KERN_DEBUG
+ "%s: deleting unreferenced inode %ld\n",
+- __FUNCTION__, inode->i_ino);
++ __func__, inode->i_ino);
+ jbd_debug(2, "deleting unreferenced inode %ld\n",
+ inode->i_ino);
+ nr_orphans++;
+@@ -1525,6 +1529,346 @@ static unsigned long descriptor_loc(stru