git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
ext3
/
file.c
diff --git
a/fs/ext3/file.c
b/fs/ext3/file.c
index
4a04cbb
..
5b49704
100644
(file)
--- a/
fs/ext3/file.c
+++ b/
fs/ext3/file.c
@@
-116,7
+116,7
@@
const struct file_operations ext3_file_operations = {
.write = do_sync_write,
.aio_read = generic_file_aio_read,
.aio_write = ext3_file_write,
- .
ioctl
= ext3_ioctl,
+ .
unlocked_ioctl
= ext3_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = ext3_compat_ioctl,
#endif