Branch b1_6

[fs/lustre-release.git] / lustre / include / obd_class.h

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 9802e16..ac668cf 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -1276,10 +1276,8 @@ static inline int obd_notify(struct obd_device *obd,
                 RETURN(-EINVAL);
         }
 
-        if (!OBP(obd, notify)) {
-                CERROR("obd %s has no notify handler\n", obd->obd_name);
+        if (!OBP(obd, notify)) 
                 RETURN(-ENOSYS);
-        }
 
         OBD_COUNTER_INCREMENT(obd, notify);
         RETURN(OBP(obd, notify)(obd, watched, ev, data));
@@ -1406,7 +1404,6 @@ extern void obd_sysctl_clean (void);
 
 /* uuid.c  */
 typedef __u8 class_uuid_t[16];
-void class_generate_random_uuid(class_uuid_t uuid);
 void class_uuid_unparse(class_uuid_t in, struct obd_uuid *out);
 
 /* lustre_peer.c    */
@@ -1416,4 +1413,7 @@ int class_del_uuid (char *uuid);
 void class_init_uuidlist(void);
 void class_exit_uuidlist(void);
 
+/* prng.c */
+void ll_generate_random_uuid(class_uuid_t uuid_out);
+
 #endif /* __LINUX_OBD_CLASS_H */