From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932522AbcBZGyq (ORCPT ); Fri, 26 Feb 2016 01:54:46 -0500 Received: from linuxhacker.ru ([217.76.32.60]:57970 "EHLO fiona.linuxhacker.ru" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753621AbcBZGuz (ORCPT ); Fri, 26 Feb 2016 01:50:55 -0500 From: green@linuxhacker.ru To: Greg Kroah-Hartman , devel@driverdev.osuosl.org, Andreas Dilger Cc: Linux Kernel Mailing List , Lustre Development List , Oleg Drokin Subject: [PATCH 10/25] staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined Date: Fri, 26 Feb 2016 01:49:58 -0500 Message-Id: <1456469413-931943-11-git-send-email-green@linuxhacker.ru> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1456469413-931943-1-git-send-email-green@linuxhacker.ru> References: <1456469413-931943-1-git-send-email-green@linuxhacker.ru> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleg Drokin Remove the ifdefs for the around usage. Signed-off-by: Oleg Drokin --- drivers/staging/lustre/lustre/llite/file.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c index 477dc0e..2e30c52 100644 --- a/drivers/staging/lustre/lustre/llite/file.c +++ b/drivers/staging/lustre/lustre/llite/file.c @@ -2746,21 +2746,15 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock) switch (cmd) { case F_SETLKW: -#ifdef F_SETLKW64 case F_SETLKW64: -#endif flags = 0; break; case F_SETLK: -#ifdef F_SETLK64 case F_SETLK64: -#endif flags = LDLM_FL_BLOCK_NOWAIT; break; case F_GETLK: -#ifdef F_GETLK64 case F_GETLK64: -#endif flags = LDLM_FL_TEST_LOCK; /* Save the old mode so that if the mode in the lock changes we * can decrement the appropriate reader or writer refcount. -- 2.1.0