commit | dba19c6064766730dd64757a010ec3aec503ecdb | [log] [tgz] |
---|---|---|
author | Al Viro <viro@zeniv.linux.org.uk> | Mon Jul 25 20:49:29 2011 -0400 |
committer | Al Viro <viro@zeniv.linux.org.uk> | Tue Jan 03 22:55:12 2012 -0500 |
tree | 2071835ccfcb169b6219be7d5a4692fcfdcbd2c5 | |
parent | 1b9d5ff7644ddf2723c9205f4726c95ec01bf033 [diff] [blame] |
get rid of open-coded S_ISREG(), etc. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index f011ed2..74fd747 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c
@@ -870,7 +870,7 @@ } 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;