lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2008-12-30 20:33:34 -08:00
parent 6a94cb7306 5a6bb10393
commit ec270e59a7
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/fat/dir.c
View File

@@ -841,7 +841,6 @@ const struct file_operations fat_dir_operations = {
.compat_ioctl = fat_compat_dir_ioctl, .compat_ioctl = fat_compat_dir_ioctl,
#endif #endif
.fsync = file_fsync, .fsync = file_fsync,
.llseek = generic_file_llseek,
}; };
static int fat_get_short_entry(struct inode *dir, loff_t *pos, static int fat_get_short_entry(struct inode *dir, loff_t *pos,

2
fs/fat/inode.c
View File

@@ -749,6 +749,8 @@ static struct dentry *fat_get_parent(struct dentry *child)
brelse(bh); brelse(bh);
parent = d_obtain_alias(inode); parent = d_obtain_alias(inode);
if (!IS_ERR(parent))
parent->d_op = sb->s_root->d_op;
out: out:
unlock_super(sb); unlock_super(sb);

2
fs/fat/namei_vfat.c
View File

@@ -78,7 +78,7 @@ static int vfat_revalidate_ci(struct dentry *dentry, struct nameidata *nd)
* for creation. * for creation.
*/ */
if (!(nd->flags & (LOOKUP_CONTINUE | LOOKUP_PARENT))) { if (!(nd->flags & (LOOKUP_CONTINUE | LOOKUP_PARENT))) {
if (nd->flags & LOOKUP_CREATE) if (nd->flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
return 0; return 0;
} }