Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / lustre / lustre / include / lu_object.h

diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h
index 6e25c1bb6aa316aa7e783ed9c1e9fc45aeec48b5..502bc41658c6381a909ba14819b4a05bde13208d 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@ -327,7 +327,7 @@ struct lu_device_type {
        /**
         * Number of existing device type instances.
         */
-       unsigned                                ldt_device_nr;
+       atomic_t                                ldt_device_nr;
        /**
         * Linkage into a global list of all device types.
         *
@@ -673,7 +673,6 @@ void lu_object_add(struct lu_object *before, struct lu_object *o);
 
 int  lu_device_type_init(struct lu_device_type *ldt);
 void lu_device_type_fini(struct lu_device_type *ldt);
-void lu_types_stop(void);
 
 /** @} ctors */
 
@@ -1025,7 +1024,8 @@ enum lu_context_tag {
        /**
         * Contexts usable in cache shrinker thread.
         */
-       LCT_SHRINKER  = LCT_MD_THREAD|LCT_DT_THREAD|LCT_CL_THREAD|LCT_NOREF
+       LCT_SHRINKER  = LCT_MD_THREAD | LCT_DT_THREAD | LCT_CL_THREAD |
+                       LCT_NOREF
 };
 
 /**
@@ -1263,6 +1263,22 @@ struct lu_name {
        int         ln_namelen;
 };
 
+/**
+ * Validate names (path components)
+ *
+ * To be valid \a name must be non-empty, '\0' terminated of length \a
+ * name_len, and not contain '/'. The maximum length of a name (before
+ * say -ENAMETOOLONG will be returned) is really controlled by llite
+ * and the server. We only check for something insane coming from bad
+ * integer handling here.
+ */
+static inline bool lu_name_is_valid_2(const char *name, size_t name_len)
+{
+       return name && name_len > 0 && name_len < INT_MAX &&
+              name[name_len] == '\0' && strlen(name) == name_len &&
+              !memchr(name, '/', name_len);
+}
+
 /**
  * Common buffer structure to be passed around for various xattr_{s,g}et()
  * methods.