diff options
| author |   Oleg Drokin <green@linuxhacker.ru> | 2015-07-30 18:28:02 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-31 16:01:59 -0700 |
| commit | b81f9b6db644c2ca0fbce1ac2eda8e74860e8c63 (patch) | |
| tree | ca43a80741649833da8bd567bf0febd5ea94fac8 /drivers/staging/lustre/lustre | |
| parent | staging/lustre: replace ll_umode_t with umode_t (diff) | |
| download | linux-dev-b81f9b6db644c2ca0fbce1ac2eda8e74860e8c63.tar.xz linux-dev-b81f9b6db644c2ca0fbce1ac2eda8e74860e8c63.zip | |
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>
Diffstat (limited to 'drivers/staging/lustre/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/include/linux/lustre_compat25.h | 6 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/llite_lib.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h index 1dcd78b9c5e5..f16ba9c8b214 100644 --- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h +++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h @@ -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 */ diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index ab4839cad939..39f0b2a07aec 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -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) { |