diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
| commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
| tree | 9397d1304144a288411f2118707f44ff5e862fa6 /fs/ext3/file.c | |
| parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'fs/ext3/file.c')
| -rw-r--r-- | fs/ext3/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext3/file.c b/fs/ext3/file.c index acc4913d3019..3be1e0689c9a 100644 --- a/fs/ext3/file.c +++ b/fs/ext3/file.c | |||
| @@ -134,5 +134,6 @@ const struct inode_operations ext3_file_inode_operations = { | |||
| 134 | .removexattr = generic_removexattr, | 134 | .removexattr = generic_removexattr, |
| 135 | #endif | 135 | #endif |
| 136 | .permission = ext3_permission, | 136 | .permission = ext3_permission, |
| 137 | .fiemap = ext3_fiemap, | ||
| 137 | }; | 138 | }; |
| 138 | 139 | ||