b=22360 for close, map all errors to EIO

i=Johann Lombardi
i=ZhiYong Tian

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 0d36c1d..0a03a71 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -28,7 +28,7 @@ Description: add list_param to b1_8 and add "-R" option to list params
 Severity   : enhancement
 Bugzilla   : 22194
 Description: lfs quota output is not very convenient for awk/sed-parsing
-Details    : Some positions if lfs quota output table could be empty or
+Details    : Some positions in lfs quota output table could be empty or
             non-empty which made it hard to parse it with scripts, now a dash
             is put instead of space where there is not supposed to be any data.
 

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 9d58f08..c007815 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -3050,7 +3050,7 @@ int ll_flush(struct file *file, fl_owner_t id)
                         rc = err;
         }
 
-        return rc;
+        return rc ? -EIO : 0;
 }
 
 int ll_fsync(struct file *file, struct dentry *dentry, int data)