Commit dba19c60 authored by Al Viro's avatar Al Viro
Browse files

get rid of open-coded S_ISREG(), etc. 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1b9d5ff7

fs/ceph/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ static int ceph_unlink(struct inode *dir, struct dentry *dentry) 
	} else if (ceph_snap(dir) == CEPH_NOSNAP) {

		dout("unlink/rmdir dir %p dn %p inode %p\n",

		     dir, dentry, inode);

		op = ((dentry->d_inode->i_mode & S_IFMT) == S_IFDIR) ?

		op = S_ISDIR(dentry->d_inode->i_mode) ?

			CEPH_MDS_OP_RMDIR : CEPH_MDS_OP_UNLINK;

	} else

		goto out;

security/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int create_by_name(const char *name, mode_t mode, 
	mutex_lock(&parent->d_inode->i_mutex);

	*dentry = lookup_one_len(name, parent, strlen(name));

	if (!IS_ERR(*dentry)) {

		if ((mode & S_IFMT) == S_IFDIR)

		if (S_ISDIR(mode))

			error = mkdir(parent->d_inode, *dentry, mode);

		else

			error = create(parent->d_inode, *dentry, mode);

security/selinux/hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -1740,7 +1740,7 @@ static inline u32 file_mask_to_av(int mode, int mask) 
{

	u32 av = 0;



	if ((mode & S_IFMT) != S_IFDIR) {

	if (!S_ISDIR(mode)) {

		if (mask & MAY_EXEC)

			av |= FILE__EXECUTE;

		if (mask & MAY_READ)