From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 2 Aug 2013 08:08:01 +0000 (+0800)
Subject: staging: lustre: remove ll_generic_permission()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8707c96e960d34f9dfee15240b1797084512fcef;p=openwrt%2Fstaging%2Fblogic.git

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 65c7dd8eb965..b44bc03c5b9e 100644
--- 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 0a6d28f7fb58..20416fcf2e9c 100644
--- 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);
 }