projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
relay.c
diff --git
a/kernel/relay.c
b/kernel/relay.c
index 5a56d3c8dc03a799e5f53169c85c7f33f05727eb..e9dbaeb8fd65c7d0af385043cddf2b7d7ef7fa8c 100644
(file)
--- a/
kernel/relay.c
+++ b/
kernel/relay.c
@@
-407,7
+407,7
@@
static inline void relay_set_buf_dentry(struct rchan_buf *buf,
struct dentry *dentry)
{
buf->dentry = dentry;
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,
}
static struct dentry *relay_create_buf_file(struct rchan *chan,
@@
-733,7
+733,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->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
buf->chan->subbuf_size -
buf->padding[old_subbuf];
else