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/ocfs2/file.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/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, |