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/ufs | |
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/ufs')
-rw-r--r-- | fs/ufs/dir.c | 2 | ||||
-rw-r--r-- | fs/ufs/file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index 7c10c68902ae..1a561202d3f4 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c | |||
@@ -620,7 +620,7 @@ int ufs_empty_dir (struct inode * inode) | |||
620 | return 1; | 620 | return 1; |
621 | } | 621 | } |
622 | 622 | ||
623 | struct file_operations ufs_dir_operations = { | 623 | const struct file_operations ufs_dir_operations = { |
624 | .read = generic_read_dir, | 624 | .read = generic_read_dir, |
625 | .readdir = ufs_readdir, | 625 | .readdir = ufs_readdir, |
626 | .fsync = file_fsync, | 626 | .fsync = file_fsync, |
diff --git a/fs/ufs/file.c b/fs/ufs/file.c index 62ad481810ef..312fd3f86313 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c | |||
@@ -31,7 +31,7 @@ | |||
31 | * the ufs filesystem. | 31 | * the ufs filesystem. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | struct file_operations ufs_file_operations = { | 34 | const struct file_operations ufs_file_operations = { |
35 | .llseek = generic_file_llseek, | 35 | .llseek = generic_file_llseek, |
36 | .read = generic_file_read, | 36 | .read = generic_file_read, |
37 | .write = generic_file_write, | 37 | .write = generic_file_write, |