[PATCH] revert changes to pipefs for i_ino uniqueness

[Jeff Layton]

Since posting that patch to add i_ino uniqueness to pipefs, I've gotten some
comments that have convinced me that we should probably leave it as is for
now (at least until someone we a good reason).

So, please back out that patch from -mm.

The patch below should revert pipefs to its original state.

Thanks,

Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>

diff --git a/fs/pipe.c b/fs/pipe.c
index 9b3cb34..68090e8 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -871,8 +871,6 @@ static struct inode * get_pipe_inode(void)
 	inode->i_uid = current->fsuid;
 	inode->i_gid = current->fsgid;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-	inode->i_ino = iunique(pipe_mnt->mnt_sb, 1);
-	insert_inode_hash(inode);
 
 	return inode;
 
@@ -1005,11 +1003,6 @@ int do_pipe(int *fd)
 	return error;
 }
 
-static struct super_operations pipefs_sops = {
-	.statfs		= simple_statfs,
-	.drop_inode	= generic_delete_inode,
-};
-
 /*
  * pipefs should _never_ be mounted by userland - too much of security hassle,
  * no real gain from having the whole whorehouse mounted. So we don't need
@@ -1020,7 +1013,7 @@ static int pipefs_get_sb(struct file_system_type *fs_type,
 			 int flags, const char *dev_name, void *data,
 			 struct vfsmount *mnt)
 {
-	return get_sb_pseudo(fs_type, "pipe:", &pipefs_sops, PIPEFS_MAGIC, mnt);
+	return get_sb_pseudo(fs_type, "pipe:", NULL, PIPEFS_MAGIC, mnt);
 }
 
 static struct file_system_type pipe_fs_type = {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/