X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fstack.c;h=67716f6a1a4a29ddb5e59dda194f837cedbfe210;hb=8a3351bbb93b15ec5d35fd4b3e6e971d6285e674;hp=5ddbc34535f9300ddbe8dc0578d67d0dc7dccea8;hpb=3be11c8f4f2fa194834c2e83540f34da442b8977;p=pandora-kernel.git

diff --git a/fs/stack.c b/fs/stack.c
index 5ddbc34535f9..67716f6a1a4a 100644
--- a/fs/stack.c
+++ b/fs/stack.c
@@ -20,11 +20,6 @@ EXPORT_SYMBOL_GPL(fsstack_copy_inode_size);
 void fsstack_copy_attr_all(struct inode *dest, const struct inode *src,
 				int (*get_nlinks)(struct inode *))
 {
-	if (!get_nlinks)
-		dest->i_nlink = src->i_nlink;
-	else
-		dest->i_nlink = (*get_nlinks)(dest);
-
 	dest->i_mode = src->i_mode;
 	dest->i_uid = src->i_uid;
 	dest->i_gid = src->i_gid;
@@ -35,6 +30,13 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src,
 	dest->i_blkbits = src->i_blkbits;
 	dest->i_flags = src->i_flags;
 
-	fsstack_copy_inode_size(dest, src);
+	/*
+	 * Update the nlinks AFTER updating the above fields, because the
+	 * get_links callback may depend on them.
+	 */
+	if (!get_nlinks)
+		dest->i_nlink = src->i_nlink;
+	else
+		dest->i_nlink = (*get_nlinks)(dest);
 }
 EXPORT_SYMBOL_GPL(fsstack_copy_attr_all);