Commit b81f9b6d authored Jul 30, 2015 by Oleg Drokin Committed by Greg Kroah-Hartman Jul 31, 2015

staging/lustre: ATTR_TIMES_SET is always defined, so don't check it



Remove ATTR_TIMES_SET check as it's always present, move
the mask of times define close to where it's used.

Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e3befdc7

drivers/staging/lustre/lustre/include/linux/lustre_compat25.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -140,10 +140,4 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
		# define ext2_find_next_zero_bit find_next_zero_bit_le
		#endif

		#ifdef ATTR_TIMES_SET
		# define TIMES_SET_FLAGS (ATTR_MTIME_SET \| ATTR_ATIME_SET \| ATTR_TIMES_SET)
		#else
		# define TIMES_SET_FLAGS (ATTR_MTIME_SET \| ATTR_ATIME_SET)
		#endif

		#endif /* _COMPAT25_H */

drivers/staging/lustre/lustre/llite/llite_lib.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1150,6 +1150,8 @@ void ll_clear_inode(struct inode *inode)
		lli->lli_has_smd = false;
		}

		#define TIMES_SET_FLAGS (ATTR_MTIME_SET \| ATTR_ATIME_SET \| ATTR_TIMES_SET)

		static int ll_md_setattr(struct dentry dentry, struct md_op_data op_data,
		struct md_open_data **mod)
		{