The patch titled
ecryptfs: use special_file()
has been added to the -mm tree. Its filename is
ecryptfs-use-special_file.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ecryptfs: use special_file()
From: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Use the special_file() macro to check whether an inode is special instead of
open-coding it.
Cc: Mike Halcrow <mhalcrow@xxxxxxxxxx>
Cc: Phillip Hellewell <phillip@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/main.c | 5 +----
1 files changed, 1 insertion(+), 4 deletions(-)
diff -puN fs/ecryptfs/main.c~ecryptfs-use-special_file fs/ecryptfs/main.c
--- a/fs/ecryptfs/main.c~ecryptfs-use-special_file
+++ a/fs/ecryptfs/main.c
@@ -104,10 +104,7 @@ int ecryptfs_interpose(struct dentry *lo
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;
_
Patches currently in -mm which might be from penberg@xxxxxxxxxxxxxx are
ext2-fsid-for-statvfs.patch
ext3-fsid-for-statvfs.patch
ext4-fsid-for-statvfs.patch
ecryptfs-superblock-cleanups.patch
ecryptfs-use-special_file.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
