diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:33:34 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:33:34 -0800 |
commit | ec270e59a74eee972006a87c8e12514a20588369 (patch) | |
tree | 6ec13c87f75322a2816c09bb290b6e66bf5116e4 /fs/fat/dir.c | |
parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
parent | 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
fat: make sure to set d_ops in fat_get_parent
fat: fix duplicate addition of ->llseek handler
fat: drop negative dentry on rename() path
Diffstat (limited to 'fs/fat/dir.c')
-rw-r--r-- | fs/fat/dir.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/fat/dir.c b/fs/fat/dir.c index 67e058357098..3a7f603b6982 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -841,7 +841,6 @@ const struct file_operations fat_dir_operations = { .compat_ioctl = fat_compat_dir_ioctl, #endif .fsync = file_fsync, - .llseek = generic_file_llseek, }; static int fat_get_short_entry(struct inode *dir, loff_t *pos, |