Merge branch 'uaccess' into fixes

[firefly-linux-kernel-4.4.55.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index 5a56d3c8dc03a799e5f53169c85c7f33f05727eb..0b4570cfacaeb2f5290d8f4b98d256943d22333c 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -81,10 +81,7 @@ static struct page **relay_alloc_page_array(unsigned int n_pages)
  */
 static void relay_free_page_array(struct page **array)
 {
-       if (is_vmalloc_addr(array))
-               vfree(array);
-       else
-               kfree(array);
+       kvfree(array);
 }
 
 /**
@@ -407,7 +404,7 @@ static inline void relay_set_buf_dentry(struct rchan_buf *buf,
                                        struct dentry *dentry)
 {
        buf->dentry = dentry;
-       buf->dentry->d_inode->i_size = buf->early_bytes;
+       d_inode(buf->dentry)->i_size = buf->early_bytes;
 }
 
 static struct dentry *relay_create_buf_file(struct rchan *chan,
@@ -733,7 +730,7 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
                buf->padding[old_subbuf] = buf->prev_padding;
                buf->subbufs_produced++;
                if (buf->dentry)
-                       buf->dentry->d_inode->i_size +=
+                       d_inode(buf->dentry)->i_size +=
                                buf->chan->subbuf_size -
                                buf->padding[old_subbuf];
                else