diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
commit | 9a21247181d93fdf99255911845ecdb041d21583 (patch) | |
tree | 6d69be36f8a2bd8c76bf02ead2f0121a511c0a92 /fs/pipe.c | |
parent | c752666c17f870fa8ae9f16804dd457e9e6daaec (diff) | |
parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) |
Merge branch 'master'
Diffstat (limited to 'fs/pipe.c')
-rw-r--r-- | fs/pipe.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -605,7 +605,7 @@ struct file_operations rdwr_fifo_fops = { | |||
605 | .fasync = pipe_rdwr_fasync, | 605 | .fasync = pipe_rdwr_fasync, |
606 | }; | 606 | }; |
607 | 607 | ||
608 | struct file_operations read_pipe_fops = { | 608 | static struct file_operations read_pipe_fops = { |
609 | .llseek = no_llseek, | 609 | .llseek = no_llseek, |
610 | .read = pipe_read, | 610 | .read = pipe_read, |
611 | .readv = pipe_readv, | 611 | .readv = pipe_readv, |
@@ -617,7 +617,7 @@ struct file_operations read_pipe_fops = { | |||
617 | .fasync = pipe_read_fasync, | 617 | .fasync = pipe_read_fasync, |
618 | }; | 618 | }; |
619 | 619 | ||
620 | struct file_operations write_pipe_fops = { | 620 | static struct file_operations write_pipe_fops = { |
621 | .llseek = no_llseek, | 621 | .llseek = no_llseek, |
622 | .read = bad_pipe_r, | 622 | .read = bad_pipe_r, |
623 | .write = pipe_write, | 623 | .write = pipe_write, |
@@ -629,7 +629,7 @@ struct file_operations write_pipe_fops = { | |||
629 | .fasync = pipe_write_fasync, | 629 | .fasync = pipe_write_fasync, |
630 | }; | 630 | }; |
631 | 631 | ||
632 | struct file_operations rdwr_pipe_fops = { | 632 | static struct file_operations rdwr_pipe_fops = { |
633 | .llseek = no_llseek, | 633 | .llseek = no_llseek, |
634 | .read = pipe_read, | 634 | .read = pipe_read, |
635 | .readv = pipe_readv, | 635 | .readv = pipe_readv, |