git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[safe/jmp/linux-2.6]
/
fs
/
udf
/
dir.c
diff --git
a/fs/udf/dir.c
b/fs/udf/dir.c
index
f0f2a43
..
3a84455
100644
(file)
--- a/
fs/udf/dir.c
+++ b/
fs/udf/dir.c
@@
-209,6
+209,6
@@
static int udf_readdir(struct file *filp, void *dirent, filldir_t filldir)
const struct file_operations udf_dir_operations = {
.read = generic_read_dir,
.readdir = udf_readdir,
- .
ioctl
= udf_ioctl,
+ .
unlocked_ioctl
= udf_ioctl,
.fsync = simple_fsync,
};