From ce173b3d1abcddb968040d0a903bf5b4daa69995 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 19 Oct 2006 23:28:14 -0700 Subject: [PATCH] --- yaml --- r: 39950 b: refs/heads/master c: 26da82058e62ea173559a26881b16d10089645ba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/main.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8b1195de5223..8492dc0762a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb5527e68d495650a7658fec9a7246bf922db212 +refs/heads/master: 26da82058e62ea173559a26881b16d10089645ba diff --git a/trunk/fs/ecryptfs/main.c b/trunk/fs/ecryptfs/main.c index 7a11b8ae6644..5938a232d11b 100644 --- a/trunk/fs/ecryptfs/main.c +++ b/trunk/fs/ecryptfs/main.c @@ -104,10 +104,7 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry, inode->i_op = &ecryptfs_dir_iops; if (S_ISDIR(lower_inode->i_mode)) inode->i_fop = &ecryptfs_dir_fops; - /* TODO: Is there a better way to identify if the inode is - * special? */ - if (S_ISBLK(lower_inode->i_mode) || S_ISCHR(lower_inode->i_mode) || - S_ISFIFO(lower_inode->i_mode) || S_ISSOCK(lower_inode->i_mode)) + if (special_file(lower_inode->i_mode)) init_special_inode(inode, lower_inode->i_mode, lower_inode->i_rdev); dentry->d_op = &ecryptfs_dops;