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

diff --combined fs/fat/inode.c
index d937aaf77374f4b720aa85328da0779daad027ae,37a8af159a1387b2755a20cf1a54b4557a142e99..6b74d09adbe5fa34d425f7b2c07a8271ddcd8e14
--- 1/fs/fat/inode.c
--- 2/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@@ -749,6 -749,8 +749,8 @@@ static struct dentry *fat_get_parent(st
        brelse(bh);
  
        parent = d_obtain_alias(inode);
+       if (!IS_ERR(parent))
+               parent->d_op = sb->s_root->d_op;
  out:
        unlock_super(sb);
  
@@@ -926,8 -928,8 +928,8 @@@ static int parse_options(char *options
  
        opts->isvfat = is_vfat;
  
 -      opts->fs_uid = current->uid;
 -      opts->fs_gid = current->gid;
 +      opts->fs_uid = current_uid();
 +      opts->fs_gid = current_gid();
        opts->fs_fmask = opts->fs_dmask = current->fs->umask;
        opts->allow_utime = -1;
        opts->codepage = fat_default_codepage;