diff options
| author |   Oleg Drokin <green@linuxhacker.ru> | 2015-07-30 18:28:04 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-31 16:02:02 -0700 |
| commit | e56e17ea935a66fe3a6cd2445649a0d9365a8449 (patch) | |
| tree | aff7050bebe3a06e9a1b8d92ec8bfd04881559ea /drivers/staging/lustre | |
| parent | staging/lustre: ATTR_TIMES_SET is always defined, so don't check it (diff) | |
| download | linux-dev-e56e17ea935a66fe3a6cd2445649a0d9365a8449.tar.xz linux-dev-e56e17ea935a66fe3a6cd2445649a0d9365a8449.zip | |
staging/lustre: use ATTR_OPEN directly, remove ATTR_RAW
ATTR_RAW is unused.
No point in redefining ATTR_OPEN as ATTR_FROM_OPEN
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h | 12 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/mdc/mdc_lib.c | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h b/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h index 14562788e4e0..ebe8d68ed813 100644 --- a/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h +++ b/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h @@ -60,18 +60,6 @@ truncate_complete_page(struct address_space *mapping, struct page *page) ll_delete_from_page_cache(page); } -#ifdef ATTR_OPEN -# define ATTR_FROM_OPEN ATTR_OPEN -#else -# ifndef ATTR_FROM_OPEN -# define ATTR_FROM_OPEN 0 -# endif -#endif /* ATTR_OPEN */ - -#ifndef ATTR_RAW -#define ATTR_RAW 0 -#endif - #ifndef ATTR_CTIME_SET /* * set ATTR_CTIME_SET to a high value to avoid any risk of collision with other diff --git a/drivers/staging/lustre/lustre/mdc/mdc_lib.c b/drivers/staging/lustre/lustre/mdc/mdc_lib.c index d3234cb1ea22..1a850ea26849 100644 --- a/drivers/staging/lustre/lustre/mdc/mdc_lib.c +++ b/drivers/staging/lustre/lustre/mdc/mdc_lib.c @@ -286,7 +286,7 @@ static inline __u64 attr_pack(unsigned int ia_valid) sa_valid |= MDS_ATTR_KILL_SGID; if (ia_valid & ATTR_CTIME_SET) sa_valid |= MDS_ATTR_CTIME_SET; - if (ia_valid & ATTR_FROM_OPEN) + if (ia_valid & ATTR_OPEN) sa_valid |= MDS_ATTR_FROM_OPEN; if (ia_valid & ATTR_BLOCKS) sa_valid |= MDS_ATTR_BLOCKS; |