diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 11:17:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 11:17:43 -0700 |
| commit | d515e86e639890b33a09390d062b0831664f04a2 (patch) | |
| tree | 37aea609704ce28ad44840279b95725e07c19a43 /fs/udf/dir.c | |
| parent | 79c4581262e225a7c96d88b632b05ab3b5e9a52c (diff) | |
| parent | 2f07a88b30f510c7625d75cdf286903b465350a0 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: BKL ioctl pushdown
Diffstat (limited to 'fs/udf/dir.c')
| -rw-r--r-- | fs/udf/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/dir.c b/fs/udf/dir.c index f0f2a436251e..3a84455c2a77 100644 --- 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, }; |