Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / net / sunrpc / cache.c

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 636c8e04e0bebb0fff9b33e34a23bd8e40941dfc..b5f2786251b95368f4bccda69290683e1c3f0b28 100644 (file)
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -316,31 +316,29 @@ static int create_cache_proc_entries(struct cache_detail *cd)
        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("flush", S_IFREG|S_IRUSR|S_IWUSR,
+                       cd->proc_ent, &cache_flush_operations);
        cd->flush_ent = p;
        if (p == NULL)
                goto out_nomem;
-       p->proc_fops = &cache_flush_operations;
        p->owner = cd->owner;
        p->data = cd;
 
        if (cd->cache_request || cd->cache_parse) {
-               p = create_proc_entry("channel", S_IFREG|S_IRUSR|S_IWUSR,
-                                     cd->proc_ent);
+               p = proc_create("channel", S_IFREG|S_IRUSR|S_IWUSR,
+                               cd->proc_ent, &cache_file_operations);
                cd->channel_ent = p;
                if (p == NULL)
                        goto out_nomem;
-               p->proc_fops = &cache_file_operations;
                p->owner = cd->owner;
                p->data = cd;
        }
        if (cd->cache_show) {
-               p = create_proc_entry("content", S_IFREG|S_IRUSR|S_IWUSR,
-                                     cd->proc_ent);
+               p = proc_create("content", S_IFREG|S_IRUSR|S_IWUSR,
+                               cd->proc_ent, &content_file_operations);
                cd->content_ent = p;
                if (p == NULL)
                        goto out_nomem;
-               p->proc_fops = &content_file_operations;
                p->owner = cd->owner;
                p->data = cd;
        }