Commit fa528722 authored Oct 20, 2014 by Gu Zheng Committed by Jaegeuk Kim Nov 03, 2014

f2fs: remove the redundant function cond_clear_inode_flag



Use clear_inode_flag to replace the redundant cond_clear_inode_flag.

Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 8a2d0ace

fs/f2fs/acl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -236,7 +236,7 @@ static int __f2fs_set_acl(struct inode *inode, int type,
		if (acl) {
		value = f2fs_acl_to_disk(acl, &size);
		if (IS_ERR(value)) {
		cond_clear_inode_flag(fi, FI_ACL_MODE);
		clear_inode_flag(fi, FI_ACL_MODE);
		return (int)PTR_ERR(value);
		}
		}
		@@ -247,7 +247,7 @@ static int __f2fs_set_acl(struct inode *inode, int type,
		if (!error)
		set_cached_acl(inode, type, acl);

		cond_clear_inode_flag(fi, FI_ACL_MODE);
		clear_inode_flag(fi, FI_ACL_MODE);
		return error;
		}

fs/f2fs/f2fs.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -1117,15 +1117,6 @@ static inline void set_acl_inode(struct f2fs_inode_info *fi, umode_t mode)
		set_inode_flag(fi, FI_ACL_MODE);
		}

		static inline int cond_clear_inode_flag(struct f2fs_inode_info *fi, int flag)
		{
		if (is_inode_flag_set(fi, FI_ACL_MODE)) {
		clear_inode_flag(fi, FI_ACL_MODE);
		return 1;
		}
		return 0;
		}

		static inline void get_inline_info(struct f2fs_inode_info *fi,
		struct f2fs_inode *ri)
		{