diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2006-10-20 02:28:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:35 -0400 |
commit | 26da82058e62ea173559a26881b16d10089645ba (patch) | |
tree | 76d897ac2792683193b79def25b3e88ebaa8d49a | |
parent | fb5527e68d495650a7658fec9a7246bf922db212 (diff) |
[PATCH] ecryptfs: use special_file()
Use the special_file() macro to check whether an inode is special instead of
open-coding it.
Acked-by: Mike Halcrow <mhalcrow@us.ibm.com>
Cc: Phillip Hellewell <phillip@hellewell.homeip.net>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/ecryptfs/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index 7a11b8ae6644..5938a232d11b 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
@@ -104,10 +104,7 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry, | |||
104 | inode->i_op = &ecryptfs_dir_iops; | 104 | inode->i_op = &ecryptfs_dir_iops; |
105 | if (S_ISDIR(lower_inode->i_mode)) | 105 | if (S_ISDIR(lower_inode->i_mode)) |
106 | inode->i_fop = &ecryptfs_dir_fops; | 106 | inode->i_fop = &ecryptfs_dir_fops; |
107 | /* TODO: Is there a better way to identify if the inode is | 107 | if (special_file(lower_inode->i_mode)) |
108 | * special? */ | ||
109 | if (S_ISBLK(lower_inode->i_mode) || S_ISCHR(lower_inode->i_mode) || | ||
110 | S_ISFIFO(lower_inode->i_mode) || S_ISSOCK(lower_inode->i_mode)) | ||
111 | init_special_inode(inode, lower_inode->i_mode, | 108 | init_special_inode(inode, lower_inode->i_mode, |
112 | lower_inode->i_rdev); | 109 | lower_inode->i_rdev); |
113 | dentry->d_op = &ecryptfs_dops; | 110 | dentry->d_op = &ecryptfs_dops; |