staging: lustre: remove ll_generic_permission()

It was a wrapper around generic_permission(), totally useless.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index 65c7dd8eb9656bd70eb1ab49ae914c7b70147e01..b44bc03c5b9e1d36ad98bd7f03df014a899bea2f 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -87,9 +87,6 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
 
 #define LTIME_S(time)             (time.tv_sec)
 
-# define ll_generic_permission(inode, mask, flags, check_acl) \
-        generic_permission(inode, mask)
-
 #define ll_vfs_symlink(dir, dentry, mnt, path, mode) \
                       vfs_symlink(dir, dentry, path)
 

diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index 0a6d28f7fb58108e74935d8cbc5436ee200e7cf2..20416fcf2e9c3a13d4de2d47902f6e91c0976a3d 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -2721,7 +2721,7 @@ int ll_inode_permission(struct inode *inode, int mask)
                return lustre_check_remote_perm(inode, mask);
 
        ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_INODE_PERM, 1);
-       rc = ll_generic_permission(inode, mask, flags, ll_check_acl);
+       rc = generic_permission(inode, mask);
 
        RETURN(rc);
 }