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/ocfs2/file.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r-- | fs/ocfs2/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 4b4cbadd5838..34e903a6a46b 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -1176,7 +1176,7 @@ struct inode_operations ocfs2_special_file_iops = { | |||
1176 | .getattr = ocfs2_getattr, | 1176 | .getattr = ocfs2_getattr, |
1177 | }; | 1177 | }; |
1178 | 1178 | ||
1179 | struct file_operations ocfs2_fops = { | 1179 | const struct file_operations ocfs2_fops = { |
1180 | .read = do_sync_read, | 1180 | .read = do_sync_read, |
1181 | .write = do_sync_write, | 1181 | .write = do_sync_write, |
1182 | .sendfile = generic_file_sendfile, | 1182 | .sendfile = generic_file_sendfile, |
@@ -1188,7 +1188,7 @@ struct file_operations ocfs2_fops = { | |||
1188 | .aio_write = ocfs2_file_aio_write, | 1188 | .aio_write = ocfs2_file_aio_write, |
1189 | }; | 1189 | }; |
1190 | 1190 | ||
1191 | struct file_operations ocfs2_dops = { | 1191 | const struct file_operations ocfs2_dops = { |
1192 | .read = generic_read_dir, | 1192 | .read = generic_read_dir, |
1193 | .readdir = ocfs2_readdir, | 1193 | .readdir = ocfs2_readdir, |
1194 | .fsync = ocfs2_sync_file, | 1194 | .fsync = ocfs2_sync_file, |