diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-21 16:40:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-21 16:40:48 +0100 |
| commit | b620fd2df20d2073b4f432113e0de9a6b5d33be5 (patch) | |
| tree | 42ca7304909ad5fda8d73c87f3f742fd132da16c /fs/orangefs/orangefs-debug.h | |
| parent | Merge tag 'ceph-for-4.15-rc1' of git://github.com/ceph/ceph-client (diff) | |
| parent | orangefs: call op_release sooner when creating inodes (diff) | |
| download | linux-b620fd2df20d2073b4f432113e0de9a6b5d33be5.tar.xz linux-b620fd2df20d2073b4f432113e0de9a6b5d33be5.zip | |
Merge tag 'for-linus-4.15-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs updates from Mike Marshall:
"Fix:
- stop setting atime on inode dirty (Martin Brandenburg)
Cleanups:
- remove initialization of i_version (Jeff Layton)
- use ARRAY_SIZE (Jérémy Lefaure)
- call op_release sooner when creating inodes (Mike MarshallMartin
Brandenburg)"
* tag 'for-linus-4.15-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: call op_release sooner when creating inodes
orangefs: stop setting atime on inode dirty
orangefs: use ARRAY_SIZE
orangefs: remove initialization of i_version
Diffstat (limited to 'fs/orangefs/orangefs-debug.h')
| -rw-r--r-- | fs/orangefs/orangefs-debug.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/orangefs/orangefs-debug.h b/fs/orangefs/orangefs-debug.h index b6001bb28f5a..c7db56a31b92 100644 --- a/fs/orangefs/orangefs-debug.h +++ b/fs/orangefs/orangefs-debug.h @@ -15,8 +15,10 @@ #ifdef __KERNEL__ #include <linux/types.h> +#include <linux/kernel.h> #else #include <stdint.h> +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) #endif #define GOSSIP_NO_DEBUG (__u64)0 @@ -88,6 +90,6 @@ static struct __keyword_mask_s s_kmod_keyword_mask_map[] = { }; static const int num_kmod_keyword_mask_map = (int) - (sizeof(s_kmod_keyword_mask_map) / sizeof(struct __keyword_mask_s)); + (ARRAY_SIZE(s_kmod_keyword_mask_map)); #endif /* __ORANGEFS_DEBUG_H */ |