DEVEL15-backup-usedump-20070625

FIXES 55704

afs_com_err not com_err

(cherry picked from commit 470be46a4c6231ebf422b9fa9d9c47baa4342824)

diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c
index 048a46b1141b06032b60ae81345e575d6f5481e1..a76d5cbb7811a966fbf337f6b0d8d3e4d1e32b8f 100644 (file)
--- a/src/afs/LINUX/osi_vfsops.c
+++ b/src/afs/LINUX/osi_vfsops.c
@@ -108,6 +108,7 @@ struct file_system_type afs_fs_type = {
 struct backing_dev_info afs_backing_dev_info = {
     .ra_pages          = 0, /* disable readahead, afs does prefetch */
 };
+#endif
 
 int
 afs_fill_super(struct super_block *sb, void *data, int silent)
@@ -456,6 +457,7 @@ struct super_operations afs_sops = {
   .notify_change =     afs_notify_change,
 #endif
 };
+#endif
 
 /************** Support routines ************************/
 

diff --git a/src/bucoord/restore.c b/src/bucoord/restore.c
index bdf97e8765814e4f10fe97738cb8d811f8721044..a06bc65b15b9ad21dcd3200d58718708645d5f4f 100644 (file)
--- a/src/bucoord/restore.c
+++ b/src/bucoord/restore.c
@@ -224,7 +224,7 @@ bc_Restorer(aindex)
            code = bcdb_FindDumpByID(dumpTaskPtr->parentDumpID, dumpDescr);
            if (code)
              {
-               com_err(whoami, "Couldn't look up info for dump %d\n",
+               afs_com_err(whoami, "Couldn't look up info for dump %d\n",
                        dumpTaskPtr->parentDumpID);
                continue;
              }