X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fext4%2Fdir.c;h=2bf0331ea1946303f0caedf360dce0cb9dc38445;hb=6924d1ab8b7bbe5ab416713f5701b3316b2df85b;hp=2c23bade9aa676451972905449e8d8cc0bbcfec3;hpb=547598d3a91f11b1f802bf0b122f777c3c22f26d;p=linux-2.6 diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 2c23bade9a..2bf0331ea1 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -23,10 +23,10 @@ #include #include -#include #include #include #include +#include "ext4.h" static unsigned char ext4_filetype_table[] = { DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK @@ -42,7 +42,7 @@ const struct file_operations ext4_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = ext4_readdir, /* we take BKL. needed?*/ - .ioctl = ext4_ioctl, /* BKL held */ + .unlocked_ioctl = ext4_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ext4_compat_ioctl, #endif