Index: branches/eam_branches/ipp-20110404/Nebulous-Server/lib/Nebulous/Server.pm
===================================================================
--- branches/eam_branches/ipp-20110404/Nebulous-Server/lib/Nebulous/Server.pm	(revision 31166)
+++ branches/eam_branches/ipp-20110404/Nebulous-Server/lib/Nebulous/Server.pm	(revision 31439)
@@ -2546,9 +2546,9 @@
     }
 
-    if ($xattr) {
-        my $path = $uri->file;
-        $log->logdie("can not set xattr on $path: $!")
-            unless (setfattr($path, 'user.nebulous_key', $key->path));
-    }
+#     if ($xattr) {
+#         my $path = $uri->file;
+#         $log->logdie("can not set xattr on $path: $!")
+#             unless (setfattr($path, 'user.nebulous_key', $key->path));
+#     }
 
     return $uri;
Index: branches/eam_branches/ipp-20110404/Nebulous-Server/lib/Nebulous/Server/SQL.pm
===================================================================
--- branches/eam_branches/ipp-20110404/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 31166)
+++ branches/eam_branches/ipp-20110404/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 31439)
@@ -336,4 +336,5 @@
              AND m.available = ?
              AND m.allocate = ?
+             AND m.xattr = 0
              AND ( (v.cab_id IS NULL) ||
                    (v.cab_id != ?) )
@@ -344,4 +345,5 @@
     },
     # volume handler
+    # This has a hack to get around the lack of location awareness by using xattr.
     get_storage_volume          => qq{
         SELECT * from (
@@ -357,4 +359,5 @@
             AND available = ?
             AND allocate = ?
+            AND xattr = 0
         ORDER BY free DESC
         LIMIT ?) as topfew