From: Steve French <sfrench@us.ibm.com>
Date: Thu, 13 May 2010 22:19:32 +0000 (+0000)
Subject: Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=baa456331738b4e76a92318b62b354377a30ad80;p=linux-beck.git

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	fs/cifs/inode.c
---

baa456331738b4e76a92318b62b354377a30ad80
diff --cc fs/cifs/inode.c
index b35cb031c20c,29b9ea244c81..5b042fc46450
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@@ -734,7 -744,8 +744,8 @@@ cifs_iget(struct super_block *sb, struc
  	unsigned long hash;
  	struct inode *inode;
  
+ retry_iget5_locked:
 -	cFYI(1, ("looking for uniqueid=%llu", fattr->cf_uniqueid));
 +	cFYI(1, "looking for uniqueid=%llu", fattr->cf_uniqueid);
  
  	/* hash down to 32-bits on 32-bit arch */
  	hash = cifs_uniqueid_to_ino_t(fattr->cf_uniqueid);