diff options
author | Oleg Drokin <green@linuxhacker.ru> | 2015-07-30 18:27:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-31 16:01:53 -0700 |
commit | e3befdc7579eee51407ad162a5614ba30c97a405 (patch) | |
tree | a43bd9e5903dc008af3f022182d922f1df6c20bd /drivers/staging/lustre/lustre | |
parent | staging/lustre: remove *hw_segments compat defines (diff) | |
download | linux-dev-e3befdc7579eee51407ad162a5614ba30c97a405.tar.xz linux-dev-e3befdc7579eee51407ad162a5614ba30c97a405.zip |
staging/lustre: replace ll_umode_t with umode_t
umode_t is what we need anyway, so replace all users
and drop the define.
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/namei.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h index d0e8f3c813a1..1dcd78b9c5e5 100644 --- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h +++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h @@ -146,10 +146,4 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount) # define TIMES_SET_FLAGS (ATTR_MTIME_SET | ATTR_ATIME_SET) #endif - -#include <linux/version.h> -#include <linux/fs.h> - -# define ll_umode_t umode_t - #endif /* _COMPAT25_H */ diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c index 72ce6e72845f..2ed1e0ac5553 100644 --- a/drivers/staging/lustre/lustre/llite/namei.c +++ b/drivers/staging/lustre/lustre/llite/namei.c @@ -1008,7 +1008,7 @@ static int ll_unlink(struct inode *dir, struct dentry *dentry) return rc; } -static int ll_mkdir(struct inode *dir, struct dentry *dentry, ll_umode_t mode) +static int ll_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) { int err; |