Merge tag 'ecryptfs-4.3-rc1-stale-dcache' of... (b9ffce9a) · Commits · 戴 / test

fs/ecryptfs/crypto.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -258,8 +258,7 @@ void ecryptfs_destroy_mount_crypt_stat(
		&mount_crypt_stat->global_auth_tok_list,
		mount_crypt_stat_list) {
		list_del(&auth_tok->mount_crypt_stat_list);
		if (auth_tok->global_auth_tok_key
		&& !(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
		if (!(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
		key_put(auth_tok->global_auth_tok_key);
		kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok);
		}

+8 −8

Original line number	Diff line number	Diff line
		@@ -45,20 +45,20 @@
		static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags)
		{
		struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
		int rc;

		if (!(lower_dentry->d_flags & DCACHE_OP_REVALIDATE))
		return 1;
		int rc = 1;

		if (flags & LOOKUP_RCU)
		return -ECHILD;

		if (lower_dentry->d_flags & DCACHE_OP_REVALIDATE)
		rc = lower_dentry->d_op->d_revalidate(lower_dentry, flags);

		if (d_really_is_positive(dentry)) {
		struct inode *lower_inode =
		ecryptfs_inode_to_lower(d_inode(dentry));
		struct inode *inode = d_inode(dentry);

		fsstack_copy_attr_all(d_inode(dentry), lower_inode);
		fsstack_copy_attr_all(inode, ecryptfs_inode_to_lower(inode));
		if (!inode->i_nlink)
		return 0;
		}
		return rc;
		}