diff options
| -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; |