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/ext2/file.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'fs/ext2/file.c')
-rw-r--r-- | fs/ext2/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c index a484412fc782..509cceca04db 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c | |||
@@ -39,7 +39,7 @@ static int ext2_release_file (struct inode * inode, struct file * filp) | |||
39 | * We have mostly NULL's here: the current defaults are ok for | 39 | * We have mostly NULL's here: the current defaults are ok for |
40 | * the ext2 filesystem. | 40 | * the ext2 filesystem. |
41 | */ | 41 | */ |
42 | struct file_operations ext2_file_operations = { | 42 | const struct file_operations ext2_file_operations = { |
43 | .llseek = generic_file_llseek, | 43 | .llseek = generic_file_llseek, |
44 | .read = generic_file_read, | 44 | .read = generic_file_read, |
45 | .write = generic_file_write, | 45 | .write = generic_file_write, |
@@ -56,7 +56,7 @@ struct file_operations ext2_file_operations = { | |||
56 | }; | 56 | }; |
57 | 57 | ||
58 | #ifdef CONFIG_EXT2_FS_XIP | 58 | #ifdef CONFIG_EXT2_FS_XIP |
59 | struct file_operations ext2_xip_file_operations = { | 59 | const struct file_operations ext2_xip_file_operations = { |
60 | .llseek = generic_file_llseek, | 60 | .llseek = generic_file_llseek, |
61 | .read = xip_file_read, | 61 | .read = xip_file_read, |
62 | .write = xip_file_write, | 62 | .write = xip_file_write, |