git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SUNRPC: The sunrpc server code should not be used by out-of-tree modules
[safe/jmp/linux-2.6]
/
net
/
sunrpc
/
cache.c
diff --git
a/net/sunrpc/cache.c
b/net/sunrpc/cache.c
index
636c8e0
..
4735caa
100644
(file)
--- a/
net/sunrpc/cache.c
+++ b/
net/sunrpc/cache.c
@@
-98,7
+98,7
@@
struct cache_head *sunrpc_cache_lookup(struct cache_detail *detail,
return new;
}
return new;
}
-EXPORT_SYMBOL(sunrpc_cache_lookup);
+EXPORT_SYMBOL
_GPL
(sunrpc_cache_lookup);
static void queue_loose(struct cache_detail *detail, struct cache_head *ch);
static void queue_loose(struct cache_detail *detail, struct cache_head *ch);
@@
-173,7
+173,7
@@
struct cache_head *sunrpc_cache_update(struct cache_detail *detail,
cache_put(old, detail);
return tmp;
}
cache_put(old, detail);
return tmp;
}
-EXPORT_SYMBOL(sunrpc_cache_update);
+EXPORT_SYMBOL
_GPL
(sunrpc_cache_update);
static int cache_make_upcall(struct cache_detail *detail, struct cache_head *h);
/*
static int cache_make_upcall(struct cache_detail *detail, struct cache_head *h);
/*
@@
-245,7
+245,7
@@
int cache_check(struct cache_detail *detail,
cache_put(h, detail);
return rv;
}
cache_put(h, detail);
return rv;
}
-EXPORT_SYMBOL(cache_check);
+EXPORT_SYMBOL
_GPL
(cache_check);
/*
* caches need to be periodically cleaned.
/*
* caches need to be periodically cleaned.
@@
-316,33
+316,28
@@
static int create_cache_proc_entries(struct cache_detail *cd)
cd->proc_ent->owner = cd->owner;
cd->channel_ent = cd->content_ent = NULL;
cd->proc_ent->owner = cd->owner;
cd->channel_ent = cd->content_ent = NULL;
- p = create_proc_entry("flush", S_IFREG|S_IRUSR|S_IWUSR, cd->proc_ent);
+ p = proc_create_data("flush", S_IFREG|S_IRUSR|S_IWUSR,
+ cd->proc_ent, &cache_flush_operations, cd);
cd->flush_ent = p;
if (p == NULL)
goto out_nomem;
cd->flush_ent = p;
if (p == NULL)
goto out_nomem;
- p->proc_fops = &cache_flush_operations;
p->owner = cd->owner;
p->owner = cd->owner;
- p->data = cd;
if (cd->cache_request || cd->cache_parse) {
if (cd->cache_request || cd->cache_parse) {
- p =
create_proc_entry
("channel", S_IFREG|S_IRUSR|S_IWUSR,
-
cd->proc_ent
);
+ p =
proc_create_data
("channel", S_IFREG|S_IRUSR|S_IWUSR,
+
cd->proc_ent, &cache_file_operations, cd
);
cd->channel_ent = p;
if (p == NULL)
goto out_nomem;
cd->channel_ent = p;
if (p == NULL)
goto out_nomem;
- p->proc_fops = &cache_file_operations;
p->owner = cd->owner;
p->owner = cd->owner;
- p->data = cd;
}
if (cd->cache_show) {
}
if (cd->cache_show) {
- p =
create_proc_entry
("content", S_IFREG|S_IRUSR|S_IWUSR,
-
cd->proc_ent
);
+ p =
proc_create_data
("content", S_IFREG|S_IRUSR|S_IWUSR,
+
cd->proc_ent, &content_file_operations, cd
);
cd->content_ent = p;
if (p == NULL)
goto out_nomem;
cd->content_ent = p;
if (p == NULL)
goto out_nomem;
- p->proc_fops = &content_file_operations;
p->owner = cd->owner;
p->owner = cd->owner;
- p->data = cd;
}
return 0;
out_nomem:
}
return 0;
out_nomem:
@@
-378,7
+373,7
@@
int cache_register(struct cache_detail *cd)
schedule_delayed_work(&cache_cleaner, 0);
return 0;
}
schedule_delayed_work(&cache_cleaner, 0);
return 0;
}
-EXPORT_SYMBOL(cache_register);
+EXPORT_SYMBOL
_GPL
(cache_register);
void cache_unregister(struct cache_detail *cd)
{
void cache_unregister(struct cache_detail *cd)
{
@@
-404,7
+399,7
@@
void cache_unregister(struct cache_detail *cd)
out:
printk(KERN_ERR "nfsd: failed to unregister %s cache\n", cd->name);
}
out:
printk(KERN_ERR "nfsd: failed to unregister %s cache\n", cd->name);
}
-EXPORT_SYMBOL(cache_unregister);
+EXPORT_SYMBOL
_GPL
(cache_unregister);
/* clean cache tries to find something to clean
* and cleans it.
/* clean cache tries to find something to clean
* and cleans it.
@@
-519,7
+514,7
@@
void cache_flush(void)
while (cache_clean() != -1)
cond_resched();
}
while (cache_clean() != -1)
cond_resched();
}
-EXPORT_SYMBOL(cache_flush);
+EXPORT_SYMBOL
_GPL
(cache_flush);
void cache_purge(struct cache_detail *detail)
{
void cache_purge(struct cache_detail *detail)
{
@@
-528,7
+523,7
@@
void cache_purge(struct cache_detail *detail)
cache_flush();
detail->flush_time = 1;
}
cache_flush();
detail->flush_time = 1;
}
-EXPORT_SYMBOL(cache_purge);
+EXPORT_SYMBOL
_GPL
(cache_purge);
/*
/*
@@
-573,7
+568,6
@@
static int cache_defer_req(struct cache_req *req, struct cache_head *item)
return -ETIMEDOUT;
dreq->item = item;
return -ETIMEDOUT;
dreq->item = item;
- dreq->recv_time = get_seconds();
spin_lock(&cache_defer_lock);
spin_lock(&cache_defer_lock);
@@
-994,7
+988,7
@@
void qword_add(char **bpp, int *lp, char *str)
*bpp = bp;
*lp = len;
}
*bpp = bp;
*lp = len;
}
-EXPORT_SYMBOL(qword_add);
+EXPORT_SYMBOL
_GPL
(qword_add);
void qword_addhex(char **bpp, int *lp, char *buf, int blen)
{
void qword_addhex(char **bpp, int *lp, char *buf, int blen)
{
@@
-1023,7
+1017,7
@@
void qword_addhex(char **bpp, int *lp, char *buf, int blen)
*bpp = bp;
*lp = len;
}
*bpp = bp;
*lp = len;
}
-EXPORT_SYMBOL(qword_addhex);
+EXPORT_SYMBOL
_GPL
(qword_addhex);
static void warn_no_listener(struct cache_detail *detail)
{
static void warn_no_listener(struct cache_detail *detail)
{
@@
-1146,7
+1140,7
@@
int qword_get(char **bpp, char *dest, int bufsize)
*dest = '\0';
return len;
}
*dest = '\0';
return len;
}
-EXPORT_SYMBOL(qword_get);
+EXPORT_SYMBOL
_GPL
(qword_get);
/*
/*