Commit 962dbfd6 authored by Juston Li's avatar Juston Li Committed by Greg Kroah-Hartman
Browse files

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

Signed-off-by: default avatarJuston Li <juston.h.li@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 565f3d2f

drivers/staging/lustre/lustre/mdc/mdc_lib.c

+1 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

		}