diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /fs/pipe.c | |
parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) |
Merge ../linux-2.6
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, |