Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c5fb72c authored Aug 02, 2013 by Greg Kroah-Hartman

staging: lustre: remove ll_permission()



It was a wrapper around inode_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>

parent 6f014339

drivers/staging/lustre/lustre/include/linux/lustre_compat25.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -87,8 +87,6 @@ static inline void ll_set_fs_pwd(struct fs_struct fs, struct vfsmount mnt,

	#define LTIME_S(time) (time.tv_sec)		#define LTIME_S(time) (time.tv_sec)

	#define ll_permission(inode,mask,nd) inode_permission(inode,mask)

	# define ll_generic_permission(inode, mask, flags, check_acl) \		# define ll_generic_permission(inode, mask, flags, check_acl) \
	generic_permission(inode, mask)		generic_permission(inode, mask)

drivers/staging/lustre/lustre/llite/file.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1756,8 +1756,8 @@ static int ll_swap_layouts(struct file file1, struct file file2,
	if (!S_ISREG(llss->inode2->i_mode))		if (!S_ISREG(llss->inode2->i_mode))
	GOTO(free, rc = -EINVAL);		GOTO(free, rc = -EINVAL);

	if (ll_permission(llss->inode1, MAY_WRITE, NULL) \|\|		if (inode_permission(llss->inode1, MAY_WRITE) \|\|
	ll_permission(llss->inode2, MAY_WRITE, NULL))		inode_permission(llss->inode2, MAY_WRITE))
	GOTO(free, rc = -EPERM);		GOTO(free, rc = -EPERM);

	if (llss->inode2->i_sb != llss->inode1->i_sb)		if (llss->inode2->i_sb != llss->inode1->i_sb)