Commit 26da8205 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[PATCH] ecryptfs: use special_file() 



Use the special_file() macro to check whether an inode is special instead of
open-coding it.

Acked-by: default avatarMike Halcrow <mhalcrow@us.ibm.com>
Cc: Phillip Hellewell <phillip@hellewell.homeip.net>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fb5527e6

fs/ecryptfs/main.c

+1 −4
Original line number Diff line number Diff line
@@ -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;