aboutsummaryrefslogtreecommitdiffstats
path: root/fs/pipe.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/pipe.c')
-rw-r--r--fs/pipe.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index a72b6ff9b48a..b9422bc17028 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -601,10 +601,10 @@ pipe_fasync(int fd, struct file *filp, int on)
601 return retval; 601 return retval;
602} 602}
603 603
604static void account_pipe_buffers(struct pipe_inode_info *pipe, 604static void account_pipe_buffers(struct user_struct *user,
605 unsigned long old, unsigned long new) 605 unsigned long old, unsigned long new)
606{ 606{
607 atomic_long_add(new - old, &pipe->user->pipe_bufs); 607 atomic_long_add(new - old, &user->pipe_bufs);
608} 608}
609 609
610static bool too_many_pipe_buffers_soft(struct user_struct *user) 610static bool too_many_pipe_buffers_soft(struct user_struct *user)
@@ -641,7 +641,7 @@ struct pipe_inode_info *alloc_pipe_info(void)
641 pipe->r_counter = pipe->w_counter = 1; 641 pipe->r_counter = pipe->w_counter = 1;
642 pipe->buffers = pipe_bufs; 642 pipe->buffers = pipe_bufs;
643 pipe->user = user; 643 pipe->user = user;
644 account_pipe_buffers(pipe, 0, pipe_bufs); 644 account_pipe_buffers(user, 0, pipe_bufs);
645 mutex_init(&pipe->mutex); 645 mutex_init(&pipe->mutex);
646 return pipe; 646 return pipe;
647 } 647 }
@@ -656,7 +656,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
656{ 656{
657 int i; 657 int i;
658 658
659 account_pipe_buffers(pipe, pipe->buffers, 0); 659 account_pipe_buffers(pipe->user, pipe->buffers, 0);
660 free_uid(pipe->user); 660 free_uid(pipe->user);
661 for (i = 0; i < pipe->buffers; i++) { 661 for (i = 0; i < pipe->buffers; i++) {
662 struct pipe_buffer *buf = pipe->bufs + i; 662 struct pipe_buffer *buf = pipe->bufs + i;
@@ -1077,7 +1077,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long arg)
1077 memcpy(bufs + head, pipe->bufs, tail * sizeof(struct pipe_buffer)); 1077 memcpy(bufs + head, pipe->bufs, tail * sizeof(struct pipe_buffer));
1078 } 1078 }
1079 1079
1080 account_pipe_buffers(pipe, pipe->buffers, nr_pages); 1080 account_pipe_buffers(pipe->user, pipe->buffers, nr_pages);
1081 pipe->curbuf = 0; 1081 pipe->curbuf = 0;
1082 kfree(pipe->bufs); 1082 kfree(pipe->bufs);
1083 pipe->bufs = bufs; 1083 pipe->bufs = bufs;