diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /fs/pipe.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (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
@@ -568,7 +568,7 @@ pipe_rdwr_open(struct inode *inode, struct file *filp) | |||
568 | * The file_operations structs are not static because they | 568 | * The file_operations structs are not static because they |
569 | * are also used in linux/fs/fifo.c to do operations on FIFOs. | 569 | * are also used in linux/fs/fifo.c to do operations on FIFOs. |
570 | */ | 570 | */ |
571 | struct file_operations read_fifo_fops = { | 571 | const struct file_operations read_fifo_fops = { |
572 | .llseek = no_llseek, | 572 | .llseek = no_llseek, |
573 | .read = pipe_read, | 573 | .read = pipe_read, |
574 | .readv = pipe_readv, | 574 | .readv = pipe_readv, |
@@ -580,7 +580,7 @@ struct file_operations read_fifo_fops = { | |||
580 | .fasync = pipe_read_fasync, | 580 | .fasync = pipe_read_fasync, |
581 | }; | 581 | }; |
582 | 582 | ||
583 | struct file_operations write_fifo_fops = { | 583 | const struct file_operations write_fifo_fops = { |
584 | .llseek = no_llseek, | 584 | .llseek = no_llseek, |
585 | .read = bad_pipe_r, | 585 | .read = bad_pipe_r, |
586 | .write = pipe_write, | 586 | .write = pipe_write, |
@@ -592,7 +592,7 @@ struct file_operations write_fifo_fops = { | |||
592 | .fasync = pipe_write_fasync, | 592 | .fasync = pipe_write_fasync, |
593 | }; | 593 | }; |
594 | 594 | ||
595 | struct file_operations rdwr_fifo_fops = { | 595 | const struct file_operations rdwr_fifo_fops = { |
596 | .llseek = no_llseek, | 596 | .llseek = no_llseek, |
597 | .read = pipe_read, | 597 | .read = pipe_read, |
598 | .readv = pipe_readv, | 598 | .readv = pipe_readv, |