HADOOP-6344. Integrating change 831478 from trunk to branch 0.21. Contributed by Jakob Homan.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@831479 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1103,6 +1103,9 @@ Trunk (unreleased changes)
     -libjars and -archives options and fix Path to support URI with fragment.
     (Amareshwari Sriramadasu via szetszwo)
 
+    HADOOP-6344. Fix rm and rmr immediately delete files rather than sending 
+    to trash, if a user is over-quota. (Jakob Homan via suresh)
+
 Release 0.20.2 - Unreleased
 
   NEW FEATURES

src/java/org/apache/hadoop/fs/Trash.java

@@ -128,7 +128,8 @@ public class Trash extends Configured {
         }
       } catch (IOException e) {
         LOG.warn("Can't create trash directory: "+baseTrashPath);
-        return false;
+        cause = e;
+        break;
       }
       try {
         //