Un-inline get_pipe_info() helper function

72083646 · Linus Torvalds <[email protected]> · 2010-11-28 16:27:19 -08:00

This avoids some include-file hell, and the function isn't really
important enough to be inlined anyway.

Reported-by: Ingo Molnar <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 72083646528d4887b920deb71b37e09bc7d227bb
Parents: c66fb347

Changes

2 files changed · +13 −12

File	Status	Add	Del	Content
fs/pipe.c	modified	+12	−0	View file
include/linux/pipe_fs_i.h	modified	+1	−12	View file

fs/pipe.c

View file

diff --git a/fs/pipe.c b/fs/pipe.c
index b8997f8..04629f3 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -1199,6 +1199,18 @@ int pipe_proc_fn(struct ctl_table *table, int write, void __user *buf,
 	return ret;
 }
 
+/*
+ * After the inode slimming patch, i_pipe/i_bdev/i_cdev share the same
+ * location, so checking ->i_pipe is not enough to verify that this is a
+ * pipe.
+ */
+struct pipe_inode_info *get_pipe_info(struct file *file)
+{
+	struct inode *i = file->f_path.dentry->d_inode;
+
+	return S_ISFIFO(i->i_mode) ? i->i_pipe : NULL;
+}
+
 long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	struct pipe_inode_info *pipe;

include/linux/pipe_fs_i.h

View file

diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 3c5ac31..bb27d7e 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -160,17 +160,6 @@ void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *);
 
 /* for F_SETPIPE_SZ and F_GETPIPE_SZ */
 long pipe_fcntl(struct file *, unsigned int, unsigned long arg);
-
-/*
- * After the inode slimming patch, i_pipe/i_bdev/i_cdev share the same
- * location, so checking ->i_pipe is not enough to verify that this is a
- * pipe.
- */
-static inline struct pipe_inode_info *get_pipe_info(struct file *file)
-{
-	struct inode *i = file->f_path.dentry->d_inode;
-
-	return S_ISFIFO(i->i_mode) ? i->i_pipe : NULL;
-}
+struct pipe_inode_info *get_pipe_info(struct file *file);
 
 #endif