VFS: Fix up debugfs to use d_is_dir() in place of S_ISDIR()

Fix up debugfs to use d_is_dir(dentry) in place of S_ISDIR(dentry->d_inode->i_mode). Signed-off-by: David Howells <[email protected]> Signed-off-by: Al Viro <[email protected]>
ananjaser1211 · Oct 15, 2023 · b83468f · b83468f
1 parent 98791cf
commit b83468f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
@@ -486,7 +486,7 @@ static int __debugfs_remove(struct dentry *dentry, struct dentry *parent)
 
 	if (debugfs_positive(dentry)) {
 		dget(dentry);
-		if (S_ISDIR(dentry->d_inode->i_mode))
+		if (d_is_dir(dentry))
 			ret = simple_rmdir(parent->d_inode, dentry);
 		else
 			simple_unlink(parent->d_inode, dentry);

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
@@ -484,7 +484,7 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
 #ifdef CONFIG_SDP
 	if (crypt_stat->flags & ECRYPTFS_DEK_IS_SENSITIVE) {
 #ifdef CONFIG_SDP_KEY_DUMP
-		if (d_is_reg(ecryptfs_dentry)) {
+		if (S_ISREG(ecryptfs_dentry->d_inode->i_mode)) {
 			if(get_sdp_sysfs_key_dump()) {
 				printk("FEK[%s] : ", ecryptfs_dentry->d_name.name);
 				key_dump(crypt_stat->key, 32);
@@ -494,7 +494,7 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
 		/*
 		 * Need to update sensitive mapping on file open
 		 */
-		if (d_is_reg(ecryptfs_dentry)) {
+		if (S_ISREG(ecryptfs_dentry->d_inode->i_mode)) {
 			ecryptfs_set_mapping_sensitive(inode, mount_crypt_stat->userid, TO_SENSITIVE);
 		}
 

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
@@ -1351,7 +1351,7 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
 	mutex_lock(&crypt_stat->cs_mutex);
 	if (d_is_dir(dentry))
 		crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
-	else if (d_is_reg(dentry)
+	else if (S_ISREG(dentry->d_inode->i_mode)
 		 && (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)
 		     || !(crypt_stat->flags & ECRYPTFS_KEY_VALID))) {
 		struct ecryptfs_mount_crypt_stat *mount_crypt_stat;