Un-inline get_pipe_info() helper function
This avoids some include-file hell, and the function isn't really important enough to be inlined anyway. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c66fb34794
commit
7208364652
12
fs/pipe.c
12
fs/pipe.c
|
@ -1199,6 +1199,18 @@ int pipe_proc_fn(struct ctl_table *table, int write, void __user *buf,
|
||||||
return ret;
|
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)
|
long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
struct pipe_inode_info *pipe;
|
struct pipe_inode_info *pipe;
|
||||||
|
|
|
@ -160,17 +160,6 @@ void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *);
|
||||||
|
|
||||||
/* for F_SETPIPE_SZ and F_GETPIPE_SZ */
|
/* for F_SETPIPE_SZ and F_GETPIPE_SZ */
|
||||||
long pipe_fcntl(struct file *, unsigned int, unsigned long arg);
|
long pipe_fcntl(struct file *, unsigned int, unsigned long arg);
|
||||||
|
struct pipe_inode_info *get_pipe_info(struct file *file);
|
||||||
/*
|
|
||||||
* 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue