From: wang di <di.wang@intel.com>
Date: Tue, 10 Sep 2013 07:25:29 +0000 (-0700)
Subject: LU-3871 osd: Tell QUOTA/NAME_LLOG fid in fid_is_on_ost check
X-Git-Tag: 2.5.0~32
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=a217228ce3e1c93fdfeb1d1aa6ff48b3f82abf83

LU-3871 osd: Tell QUOTA/NAME_LLOG fid in fid_is_on_ost check

Tell QUOTA/NAME_LLOG fid during fid_is_on_ost check, so
they will not be inserted into /O, which might confuse
e2fsck otherwise.

Signed-off-by: wang di <di.wang@intel.com>
Change-Id: I4d091393b60c66a554de861359d8f5a32c83029e
Reviewed-on: http://review.whamcloud.com/7527
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c
index be873b3..3c6f906 100644
--- a/lustre/osd-zfs/osd_oi.c
+++ b/lustre/osd-zfs/osd_oi.c
@@ -245,6 +245,10 @@ int fid_is_on_ost(const struct lu_env *env, struct osd_device *osd,
 	if (fid_is_idif(fid))
 		RETURN(1);
 
+	if (unlikely(fid_is_local_file(fid) || fid_is_llog(fid)) ||
+		     fid_is_name_llog(fid) || fid_is_quota(fid))
+		RETURN(0);
+
 	if (osd->od_is_ost)
 		RETURN(1);