diff options
| -rw-r--r-- | fs/crypto/keyring.c | 15 | 
1 files changed, 2 insertions, 13 deletions
| diff --git a/fs/crypto/keyring.c b/fs/crypto/keyring.c index 098ff2e0f0bb..ab41b25d4fa1 100644 --- a/fs/crypto/keyring.c +++ b/fs/crypto/keyring.c @@ -776,9 +776,6 @@ static int check_for_busy_inodes(struct super_block *sb,  	struct list_head *pos;  	size_t busy_count = 0;  	unsigned long ino; -	struct dentry *dentry; -	char _path[256]; -	char *path = NULL;  	spin_lock(&mk->mk_decrypted_inodes_lock); @@ -797,22 +794,14 @@ static int check_for_busy_inodes(struct super_block *sb,  					 struct fscrypt_info,  					 ci_master_key_link)->ci_inode;  		ino = inode->i_ino; -		dentry = d_find_alias(inode);  	}  	spin_unlock(&mk->mk_decrypted_inodes_lock); -	if (dentry) { -		path = dentry_path(dentry, _path, sizeof(_path)); -		dput(dentry); -	} -	if (IS_ERR_OR_NULL(path)) -		path = "(unknown)"; -  	fscrypt_warn(NULL, -		     "%s: %zu inode(s) still busy after removing key with %s %*phN, including ino %lu (%s)", +		     "%s: %zu inode(s) still busy after removing key with %s %*phN, including ino %lu",  		     sb->s_id, busy_count, master_key_spec_type(&mk->mk_spec),  		     master_key_spec_len(&mk->mk_spec), (u8 *)&mk->mk_spec.u, -		     ino, path); +		     ino);  	return -EBUSY;  } | 
