diff options
-rw-r--r-- | kernel/relay.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index a615a8f513fc..510fbbd7b500 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
@@ -80,7 +80,7 @@ static struct vm_operations_struct relay_file_mmap_ops = { | |||
80 | * | 80 | * |
81 | * Caller should already have grabbed mmap_sem. | 81 | * Caller should already have grabbed mmap_sem. |
82 | */ | 82 | */ |
83 | int relay_mmap_buf(struct rchan_buf *buf, struct vm_area_struct *vma) | 83 | static int relay_mmap_buf(struct rchan_buf *buf, struct vm_area_struct *vma) |
84 | { | 84 | { |
85 | unsigned long length = vma->vm_end - vma->vm_start; | 85 | unsigned long length = vma->vm_end - vma->vm_start; |
86 | struct file *filp = vma->vm_file; | 86 | struct file *filp = vma->vm_file; |
@@ -145,7 +145,7 @@ depopulate: | |||
145 | * | 145 | * |
146 | * Returns channel buffer if successful, %NULL otherwise. | 146 | * Returns channel buffer if successful, %NULL otherwise. |
147 | */ | 147 | */ |
148 | struct rchan_buf *relay_create_buf(struct rchan *chan) | 148 | static struct rchan_buf *relay_create_buf(struct rchan *chan) |
149 | { | 149 | { |
150 | struct rchan_buf *buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL); | 150 | struct rchan_buf *buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL); |
151 | if (!buf) | 151 | if (!buf) |
@@ -175,7 +175,7 @@ free_buf: | |||
175 | * | 175 | * |
176 | * Should only be called from kref_put(). | 176 | * Should only be called from kref_put(). |
177 | */ | 177 | */ |
178 | void relay_destroy_channel(struct kref *kref) | 178 | static void relay_destroy_channel(struct kref *kref) |
179 | { | 179 | { |
180 | struct rchan *chan = container_of(kref, struct rchan, kref); | 180 | struct rchan *chan = container_of(kref, struct rchan, kref); |
181 | kfree(chan); | 181 | kfree(chan); |
@@ -185,7 +185,7 @@ void relay_destroy_channel(struct kref *kref) | |||
185 | * relay_destroy_buf - destroy an rchan_buf struct and associated buffer | 185 | * relay_destroy_buf - destroy an rchan_buf struct and associated buffer |
186 | * @buf: the buffer struct | 186 | * @buf: the buffer struct |
187 | */ | 187 | */ |
188 | void relay_destroy_buf(struct rchan_buf *buf) | 188 | static void relay_destroy_buf(struct rchan_buf *buf) |
189 | { | 189 | { |
190 | struct rchan *chan = buf->chan; | 190 | struct rchan *chan = buf->chan; |
191 | unsigned int i; | 191 | unsigned int i; |
@@ -210,7 +210,7 @@ void relay_destroy_buf(struct rchan_buf *buf) | |||
210 | * rchan_buf_struct and the channel buffer. Should only be called from | 210 | * rchan_buf_struct and the channel buffer. Should only be called from |
211 | * kref_put(). | 211 | * kref_put(). |
212 | */ | 212 | */ |
213 | void relay_remove_buf(struct kref *kref) | 213 | static void relay_remove_buf(struct kref *kref) |
214 | { | 214 | { |
215 | struct rchan_buf *buf = container_of(kref, struct rchan_buf, kref); | 215 | struct rchan_buf *buf = container_of(kref, struct rchan_buf, kref); |
216 | buf->chan->cb->remove_buf_file(buf->dentry); | 216 | buf->chan->cb->remove_buf_file(buf->dentry); |
@@ -223,11 +223,10 @@ void relay_remove_buf(struct kref *kref) | |||
223 | * | 223 | * |
224 | * Returns 1 if the buffer is empty, 0 otherwise. | 224 | * Returns 1 if the buffer is empty, 0 otherwise. |
225 | */ | 225 | */ |
226 | int relay_buf_empty(struct rchan_buf *buf) | 226 | static int relay_buf_empty(struct rchan_buf *buf) |
227 | { | 227 | { |
228 | return (buf->subbufs_produced - buf->subbufs_consumed) ? 0 : 1; | 228 | return (buf->subbufs_produced - buf->subbufs_consumed) ? 0 : 1; |
229 | } | 229 | } |
230 | EXPORT_SYMBOL_GPL(relay_buf_empty); | ||
231 | 230 | ||
232 | /** | 231 | /** |
233 | * relay_buf_full - boolean, is the channel buffer full? | 232 | * relay_buf_full - boolean, is the channel buffer full? |