diff options
author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /fs/pipe.c | |
parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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, |