From: John L. Hammond <john.hammond@intel.com>
Date: Thu, 12 Jun 2014 19:58:45 +0000 (-0500)
Subject: LU-5124 lod: use S_IS{REG,DIR} in lod_load_striping_locked()
X-Git-Tag: 2.6.0-RC1~64
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=refs%2Fchanges%2F02%2F10702%2F2

LU-5124 lod: use S_IS{REG,DIR} in lod_load_striping_locked()

In lod_load_striping_locked() use S_ISREG(mode) rather than testing
(mode & S_IFREG) and similarly for S_ISDIR().

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I040a50b485fc2b45d74daf403c041f05968e573b
Reviewed-on: http://review.whamcloud.com/10702
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
---

diff --git a/lustre/lod/lod_lov.c b/lustre/lod/lod_lov.c
index 394264b..148020a 100644
--- a/lustre/lod/lod_lov.c
+++ b/lustre/lod/lod_lov.c
@@ -857,8 +857,7 @@ int lod_load_striping_locked(const struct lu_env *env, struct lod_object *lo)
 	if (lo->ldo_dir_slave_stripe)
 		GOTO(out, rc = 0);
 
-	/* only regular files can be striped */
-	if (lu_object_attr(lod2lu_obj(lo)) & S_IFREG) {
+	if (S_ISREG(lu_object_attr(lod2lu_obj(lo)))) {
 		rc = lod_get_lov_ea(env, lo);
 		if (rc <= 0)
 			GOTO(out, rc);
@@ -869,7 +868,7 @@ int lod_load_striping_locked(const struct lu_env *env, struct lod_object *lo)
 		info->lti_buf.lb_buf = info->lti_ea_store;
 		info->lti_buf.lb_len = info->lti_ea_store_size;
 		rc = lod_parse_striping(env, lo, &info->lti_buf);
-	} else if (lu_object_attr(lod2lu_obj(lo)) & S_IFDIR) {
+	} else if (S_ISDIR(lu_object_attr(lod2lu_obj(lo)))) {
 		rc = lod_get_lmv_ea(env, lo);
 		if (rc <= 0)
 			GOTO(out, rc);