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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[pandora-kernel.git]
/
fs
/
ext3
/
dir.c
diff --git
a/fs/ext3/dir.c
b/fs/ext3/dir.c
index
5853f44
..
3d724a9
100644
(file)
--- a/
fs/ext3/dir.c
+++ b/
fs/ext3/dir.c
@@
-42,7
+42,7
@@
const struct file_operations ext3_dir_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = ext3_readdir, /* we take BKL. needed?*/
- .
ioctl = ext3_ioctl, /* BKL held */
+ .
unlocked_ioctl = ext3_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = ext3_compat_ioctl,
#endif