From: Amon Ott <ao@m-privacy.de>
Date: Mon, 23 Jan 2012 17:25:23 +0000 (-0800)
Subject: ceph: use 2 instead of 1 as fallback for 32-bit inode number
X-Git-Tag: v3.4-rc1~76^2~62
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a661fc561190c0ee2d7cfabcfa92204e2b3aa349;p=karo-tx-linux.git

ceph: use 2 instead of 1 as fallback for 32-bit inode number

The root directory of the Ceph mount has inode number 1, so falling back
to 1 always creates a collision. 2 is unused on my test systems and seems
less likely to collide.

Signed-off-by: Amon Ott <ao@m-privacy.de>
Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 1421f3d875a2..18d8a866a07b 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -367,7 +367,7 @@ static inline u32 ceph_ino_to_ino32(__u64 vino)
 	u32 ino = vino & 0xffffffff;
 	ino ^= vino >> 32;
 	if (!ino)
-		ino = 1;
+		ino = 2;
 	return ino;
 }