b=22168 Ignore EINTR returned from write

[fs/lustre-release.git] / lustre / ldlm / ldlm_internal.h

diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h
index f3f5a12..cbad123 100644 (file)
--- a/lustre/ldlm/ldlm_internal.h
+++ b/lustre/ldlm/ldlm_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -79,7 +79,7 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr, ldlm_sync_t sync,
                     int flags);
 int ldlm_cancel_lru_local(struct ldlm_namespace *ns,
                           cfs_list_t *cancels, int count, int max,
-                          int cancel_flags, int flags);
+                          ldlm_cancel_flags_t cancel_flags, int flags);
 extern int ldlm_enqueue_min;
 int ldlm_get_enq_timeout(struct ldlm_lock *lock);
 
@@ -229,7 +229,7 @@ typedef enum ldlm_policy_res ldlm_policy_res_t;
                 int rc;                                                     \
                                                                             \
                 rc = lprocfs_wr_uint(file, buffer, count, &tmp);            \
-                if (rc) {                                                   \
+                if (rc < 0) {                                               \
                         CERROR("Can't parse user input, rc = %d\n", rc);    \
                         return rc;                                          \
                 }                                                           \