From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Dec 2008 04:33:34 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
X-Git-Tag: v2.6.29-rc1~551
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ec270e59a74eee972006a87c8e12514a20588369;hp=-c;p=linux-2.6-omap-h63xx.git

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
---

ec270e59a74eee972006a87c8e12514a20588369
diff --combined fs/fat/inode.c
index d937aaf7737,37a8af159a1..6b74d09adbe
--- a/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;