net: Use octal not symbolic permissions

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

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index aa36dad32db16a59c81aee434536a50dcf3aaa71..c536cc24b3d1f6073ac1df3fddf7915f783f24df 100644 (file)
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -940,7 +940,7 @@ static __poll_t cache_poll(struct file *filp, poll_table *wait,
        poll_wait(filp, &queue_wait, wait);
 
        /* alway allow write */
-       mask = POLLOUT | POLLWRNORM;
+       mask = EPOLLOUT | EPOLLWRNORM;
 
        if (!rp)
                return mask;
@@ -950,7 +950,7 @@ static __poll_t cache_poll(struct file *filp, poll_table *wait,
        for (cq= &rp->q; &cq->list != &cd->queue;
             cq = list_entry(cq->list.next, struct cache_queue, list))
                if (!cq->reader) {
-                       mask |= POLLIN | POLLRDNORM;
+                       mask |= EPOLLIN | EPOLLRDNORM;
                        break;
                }
        spin_unlock(&queue_lock);
@@ -1621,20 +1621,20 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
        if (cd->procfs == NULL)
                goto out_nomem;
 
-       p = proc_create_data("flush", S_IFREG|S_IRUSR|S_IWUSR,
+       p = proc_create_data("flush", S_IFREG | 0600,
                             cd->procfs, &cache_flush_operations_procfs, cd);
        if (p == NULL)
                goto out_nomem;
 
        if (cd->cache_request || cd->cache_parse) {
-               p = proc_create_data("channel", S_IFREG|S_IRUSR|S_IWUSR,
-                               cd->procfs, &cache_file_operations_procfs, cd);
+               p = proc_create_data("channel", S_IFREG | 0600, cd->procfs,
+                                    &cache_file_operations_procfs, cd);
                if (p == NULL)
                        goto out_nomem;
        }
        if (cd->cache_show) {
-               p = proc_create_data("content", S_IFREG|S_IRUSR,
-                               cd->procfs, &content_file_operations_procfs, cd);
+               p = proc_create_data("content", S_IFREG | 0400, cd->procfs,
+                                    &content_file_operations_procfs, cd);
                if (p == NULL)
                        goto out_nomem;
        }