mirror of https://gitee.com/openkylin/linux.git
[PATCH] gfp_t: lib/*
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
6daa0e2862
commit
fd4f2df24b
|
@ -71,7 +71,7 @@ struct idr {
|
|||
*/
|
||||
|
||||
void *idr_find(struct idr *idp, int id);
|
||||
int idr_pre_get(struct idr *idp, unsigned gfp_mask);
|
||||
int idr_pre_get(struct idr *idp, gfp_t gfp_mask);
|
||||
int idr_get_new(struct idr *idp, void *ptr, int *id);
|
||||
int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);
|
||||
void idr_remove(struct idr *idp, int id);
|
||||
|
|
|
@ -65,7 +65,7 @@ extern void kobject_unregister(struct kobject *);
|
|||
extern struct kobject * kobject_get(struct kobject *);
|
||||
extern void kobject_put(struct kobject *);
|
||||
|
||||
extern char * kobject_get_path(struct kobject *, int);
|
||||
extern char * kobject_get_path(struct kobject *, gfp_t);
|
||||
|
||||
struct kobj_type {
|
||||
void (*release)(struct kobject *);
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
struct radix_tree_root {
|
||||
unsigned int height;
|
||||
unsigned int gfp_mask;
|
||||
gfp_t gfp_mask;
|
||||
struct radix_tree_node *rnode;
|
||||
};
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ struct ts_state
|
|||
struct ts_ops
|
||||
{
|
||||
const char *name;
|
||||
struct ts_config * (*init)(const void *, unsigned int, int);
|
||||
struct ts_config * (*init)(const void *, unsigned int, gfp_t);
|
||||
unsigned int (*find)(struct ts_config *,
|
||||
struct ts_state *);
|
||||
void (*destroy)(struct ts_config *);
|
||||
|
@ -148,7 +148,7 @@ static inline unsigned int textsearch_get_pattern_len(struct ts_config *conf)
|
|||
extern int textsearch_register(struct ts_ops *);
|
||||
extern int textsearch_unregister(struct ts_ops *);
|
||||
extern struct ts_config *textsearch_prepare(const char *, const void *,
|
||||
unsigned int, int, int);
|
||||
unsigned int, gfp_t, int);
|
||||
extern void textsearch_destroy(struct ts_config *conf);
|
||||
extern unsigned int textsearch_find_continuous(struct ts_config *,
|
||||
struct ts_state *,
|
||||
|
|
|
@ -72,7 +72,7 @@ static void free_layer(struct idr *idp, struct idr_layer *p)
|
|||
* If the system is REALLY out of memory this function returns 0,
|
||||
* otherwise 1.
|
||||
*/
|
||||
int idr_pre_get(struct idr *idp, unsigned gfp_mask)
|
||||
int idr_pre_get(struct idr *idp, gfp_t gfp_mask)
|
||||
{
|
||||
while (idp->id_free_cnt < IDR_FREE_MAX) {
|
||||
struct idr_layer *new;
|
||||
|
|
|
@ -100,7 +100,7 @@ static void fill_kobj_path(struct kobject *kobj, char *path, int length)
|
|||
* @kobj: kobject in question, with which to build the path
|
||||
* @gfp_mask: the allocation type used to allocate the path
|
||||
*/
|
||||
char *kobject_get_path(struct kobject *kobj, int gfp_mask)
|
||||
char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask)
|
||||
{
|
||||
char *path;
|
||||
int len;
|
||||
|
|
|
@ -62,7 +62,7 @@ static struct sock *uevent_sock;
|
|||
* @gfp_mask:
|
||||
*/
|
||||
static int send_uevent(const char *signal, const char *obj,
|
||||
char **envp, int gfp_mask)
|
||||
char **envp, gfp_t gfp_mask)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
char *pos;
|
||||
|
@ -98,7 +98,7 @@ static int send_uevent(const char *signal, const char *obj,
|
|||
}
|
||||
|
||||
static int do_kobject_uevent(struct kobject *kobj, enum kobject_action action,
|
||||
struct attribute *attr, int gfp_mask)
|
||||
struct attribute *attr, gfp_t gfp_mask)
|
||||
{
|
||||
char *path;
|
||||
char *attrpath;
|
||||
|
|
|
@ -254,7 +254,7 @@ unsigned int textsearch_find_continuous(struct ts_config *conf,
|
|||
* parameters or a ERR_PTR().
|
||||
*/
|
||||
struct ts_config *textsearch_prepare(const char *algo, const void *pattern,
|
||||
unsigned int len, int gfp_mask, int flags)
|
||||
unsigned int len, gfp_t gfp_mask, int flags)
|
||||
{
|
||||
int err = -ENOENT;
|
||||
struct ts_config *conf;
|
||||
|
|
Loading…
Reference in New Issue