Branch b_new_cmd

b=22564

always close epoch if not regular file

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 42746f7..2cbe707 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -135,7 +135,8 @@ static int ll_close_inode_openhandle(struct obd_export *md_exp,
                 GOTO(out, rc = -ENOMEM);
 
         ll_prepare_close(inode, op_data, och);
-        epoch_close = (op_data->flags & MF_EPOCH_CLOSE);
+        epoch_close = (op_data->flags & MF_EPOCH_CLOSE) || 
+                      !S_ISREG(inode->i_mode);
         rc = md_close(md_exp, op_data, och, &req);
         if (rc == -EAGAIN) {
                 /* This close must have closed the epoch. */