Skip to contentSkip to conversation

staging: lustre: mdc: use __FMODE_EXEC macro

PATCH New Juston Li 1 participant 1 message Nov 19, 2014 Staging

lore
Share & tools
lore

Juston Li

author
#0 lore raw

PATCH v2 1/1 staging: lustre: mdc: use __FMODE_EXEC macro

FMODE_EXEC is type fmode_t but is used in operations
with integers which leads to sparse warnings:
drivers/staging/lustre/lustre/mdc/mdc_lib.c:198:21: warning: restricted fmode_t degrades to integer drivers/staging/lustre/lustre/mdc/mdc_locks.c:300:49: warning: restricted fmode_t degrades to integer

Fix by using __FMODE_EXEC macro defined in fs.h.

Note the same warnings occurs with other fmode flags here but they don't have a corresponding int macro.

Changes since v1:
remove ifdefs. FMODE_EXEC and __FMODE_EXEC should
always be defined in fs.h

---
 drivers/staging/lustre/lustre/mdc/mdc_lib.c   | 4 +---
 drivers/staging/lustre/lustre/mdc/mdc_locks.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/staging/lustre/lustre/mdc/mdc_lib.c +1 -3
index e8732cc..4e59995 100644
@@ -194,10 +194,8 @@ static __u64 mds_pack_open_flags(__u64 flags, __u32 mode)
 		cr_flags |= MDS_OPEN_SYNC;
 	if (flags & O_DIRECTORY)
 		cr_flags |= MDS_OPEN_DIRECTORY;
-#ifdef FMODE_EXEC
-	if (flags & FMODE_EXEC)
+	if (flags & __FMODE_EXEC)
 		cr_flags |= MDS_FMODE_EXEC;
-#endif
 	if (cl_is_lov_delay_create(flags))
 		cr_flags |= MDS_OPEN_DELAY_CREATE;
 
drivers/staging/lustre/lustre/mdc/mdc_locks.c +1 -3
index b58147e..8c9b4f5 100644
@@ -296,10 +296,8 @@ static struct ptlrpc_request *mdc_intent_open_pack(struct obd_export *exp,
 		} else {
 			if (it->it_flags & (FMODE_WRITE|MDS_OPEN_TRUNC))
 				mode = LCK_CW;
-#ifdef FMODE_EXEC
-			else if (it->it_flags & FMODE_EXEC)
+			else if (it->it_flags & __FMODE_EXEC)
 				mode = LCK_PR;
-#endif
 			else
 				mode = LCK_CR;
 		}
Signature · 1 line
2.1.3