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 52d6a6f56261d26dabc458684a3529d15710e30b..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
@@
-1195,8
+1195,6
@@
static void relay_pipe_buf_release(struct pipe_inode_info *pipe,
static const struct pipe_buf_operations relay_pipe_buf_ops = {
.can_merge = 0,
static const struct pipe_buf_operations relay_pipe_buf_ops = {
.can_merge = 0,
- .map = generic_pipe_buf_map,
- .unmap = generic_pipe_buf_unmap,
.confirm = generic_pipe_buf_confirm,
.release = relay_pipe_buf_release,
.steal = generic_pipe_buf_steal,
.confirm = generic_pipe_buf_confirm,
.release = relay_pipe_buf_release,
.steal = generic_pipe_buf_steal,
@@
-1253,7
+1251,7
@@
static ssize_t subbuf_splice_actor(struct file *in,
subbuf_pages = rbuf->chan->alloc_size >> PAGE_SHIFT;
pidx = (read_start / PAGE_SIZE) % subbuf_pages;
poff = read_start & ~PAGE_MASK;
subbuf_pages = rbuf->chan->alloc_size >> PAGE_SHIFT;
pidx = (read_start / PAGE_SIZE) % subbuf_pages;
poff = read_start & ~PAGE_MASK;
- nr_pages = min_t(unsigned int, subbuf_pages,
pipe->buffers
);
+ nr_pages = min_t(unsigned int, subbuf_pages,
spd.nr_pages_max
);
for (total_len = 0; spd.nr_pages < nr_pages; spd.nr_pages++) {
unsigned int this_len, this_end, private;
for (total_len = 0; spd.nr_pages < nr_pages; spd.nr_pages++) {
unsigned int this_len, this_end, private;