From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Oct 2008 17:22:40 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Tag: MMI-PSA29.97-13-9~31125
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5ed487bc2c44ca4e9668ef9cb54c830e2a9fac47;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (46 commits)
  [PATCH] fs: add a sanity check in d_free
  [PATCH] i_version: remount support
  [patch] vfs: make security_inode_setattr() calling consistent
  [patch 1/3] FS_MBCACHE: don't needlessly make it built-in
  [PATCH] move executable checking into ->permission()
  [PATCH] fs/dcache.c: update comment of d_validate()
  [RFC PATCH] touch_mnt_namespace when the mount flags change
  [PATCH] reiserfs: add missing llseek method
  [PATCH] fix ->llseek for more directories
  [PATCH vfs-2.6 6/6] vfs: add LOOKUP_RENAME_TARGET intent
  [PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup
  [PATCH vfs-2.6 4/6] vfs: remove unnecessary fsnotify_d_instantiate()
  [PATCH vfs-2.6 3/6] vfs: add __d_instantiate() helper
  [PATCH vfs-2.6 2/6] vfs: add d_ancestor()
  [PATCH vfs-2.6 1/6] vfs: replace parent == dentry->d_parent by IS_ROOT()
  [PATCH] get rid of on-stack dentry in udf
  [PATCH 2/2] anondev: switch to IDA
  [PATCH 1/2] anondev: init IDR statically
  [JFFS2] Use d_splice_alias() not d_add() in jffs2_lookup()
  [PATCH] Optimise NFS readdir hack slightly.
  ...
---

5ed487bc2c44ca4e9668ef9cb54c830e2a9fac47
diff --cc fs/ext3/super.c
index cac29ee3b14a,5b7fee10566f..34b6fca765d7
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@@ -2833,16 -2822,12 +2833,16 @@@ static int ext3_quota_on(struct super_b
  		 * otherwise be livelocked...
  		 */
  		journal_lock_updates(EXT3_SB(sb)->s_journal);
 -		journal_flush(EXT3_SB(sb)->s_journal);
 +		err = journal_flush(EXT3_SB(sb)->s_journal);
  		journal_unlock_updates(EXT3_SB(sb)->s_journal);
 +		if (err) {
 +			path_put(&nd.path);
 +			return err;
 +		}
  	}
  
- 	err = vfs_quota_on_path(sb, type, format_id, &nd.path);
- 	path_put(&nd.path);
+ 	err = vfs_quota_on_path(sb, type, format_id, &path);
+ 	path_put(&path);
  	return err;
  }
  
diff --cc fs/nfsd/export.c
index 5cd882b8871a,676201dbdf84..5839b229cd0e
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@@ -160,21 -158,22 +160,19 @@@ static int expkey_parse(struct cache_de
  	if (len == 0) {
  		set_bit(CACHE_NEGATIVE, &key.h.flags);
  		ek = svc_expkey_update(&key, ek);
 -		if (ek)
 -			cache_put(&ek->h, &svc_expkey_cache);
 -		else err = -ENOMEM;
 +		if (!ek)
 +			err = -ENOMEM;
  	} else {
- 		struct nameidata nd;
- 		err = path_lookup(buf, 0, &nd);
+ 		err = kern_path(buf, 0, &key.ek_path);
  		if (err)
  			goto out;
  
  		dprintk("Found the path %s\n", buf);
- 		key.ek_path = nd.path;
  
  		ek = svc_expkey_update(&key, ek);
 -		if (ek)
 -			cache_put(&ek->h, &svc_expkey_cache);
 -		else
 +		if (!ek)
  			err = -ENOMEM;
- 		path_put(&nd.path);
+ 		path_put(&key.ek_path);
  	}
  	cache_flush();
   out: