get rid of open-coded S_ISREG(), etc. · tjh.dev/kernel@dba19c6

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 14 years ago dba19c60 1b9d5ff7

+3 -3

3 changed files

expand all

ceph

dir.c

security

inode.c

selinux

hooks.c

+1 -1

fs/ceph/dir.c

··· 870 870 } else if (ceph_snap(dir) == CEPH_NOSNAP) { 871 871 dout("unlink/rmdir dir %p dn %p inode %p\n", 872 872 dir, dentry, inode); 873 - op = ((dentry->d_inode->i_mode & S_IFMT) == S_IFDIR) ? 873 + op = S_ISDIR(dentry->d_inode->i_mode) ? 874 874 CEPH_MDS_OP_RMDIR : CEPH_MDS_OP_UNLINK; 875 875 } else 876 876 goto out;

+1 -1

security/inode.c

··· 164 164 mutex_lock(&parent->d_inode->i_mutex); 165 165 *dentry = lookup_one_len(name, parent, strlen(name)); 166 166 if (!IS_ERR(*dentry)) { 167 - if ((mode & S_IFMT) == S_IFDIR) 167 + if (S_ISDIR(mode)) 168 168 error = mkdir(parent->d_inode, *dentry, mode); 169 169 else 170 170 error = create(parent->d_inode, *dentry, mode);

+1 -1

security/selinux/hooks.c

··· 1740 1740 { 1741 1741 u32 av = 0; 1742 1742 1743 - if ((mode & S_IFMT) != S_IFDIR) { 1743 + if (!S_ISDIR(mode)) { 1744 1744 if (mask & MAY_EXEC) 1745 1745 av |= FILE__EXECUTE; 1746 1746 if (mask & MAY_READ)