Merge branch 'for-linus' of git://www.jni.nu/cris

[~andy/linux] / fs / udf / dir.c

diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index f0f2a436251e4cfcbc40ba9e7e3c6ee69dde47e0..51552bf50225aa207835e92c964a3d677d3731f0 100644 (file)
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -207,8 +207,9 @@ static int udf_readdir(struct file *filp, void *dirent, filldir_t filldir)
 
 /* readdir and lookup functions */
 const struct file_operations udf_dir_operations = {
+       .llseek                 = generic_file_llseek,
        .read                   = generic_read_dir,
        .readdir                = udf_readdir,
-       .ioctl                  = udf_ioctl,
-       .fsync                  = simple_fsync,
+       .unlocked_ioctl         = udf_ioctl,
+       .fsync                  = generic_file_fsync,
 };