Branch b1_6

Replace LBUG with RETURN(-EINVAL) to avoid crashing
b=5135
i=adilger
i=johann

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index dfa5ad9..be0592e 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -2833,7 +2833,7 @@ int ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock)
                 break;
         default:
                 CERROR("unknown fcntl lock type: %d\n", file_lock->fl_type);
-                LBUG();
+                RETURN (-EINVAL);
         }
 
         switch (cmd) {
@@ -2860,7 +2860,7 @@ int ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock)
                 break;
         default:
                 CERROR("unknown fcntl lock command: %d\n", cmd);
-                LBUG();
+                RETURN (-EINVAL);
         }
 
         CDEBUG(D_DLMTRACE, "inode=%lu, pid=%u, flags=%#x, mode=%u, "