Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Export 'get_pipe_info()' to other users
And in particular, use it in 'pipe_fcntl()'.
The other pipe functions do not need to use the 'careful' version, since
they are only ever called for things that are already known to be pipes.
The normal read/write/ioctl functions are called through the file
operations structures, so if a file isn't a pipe, they'd never get
called. But pipe_fcntl() is special, and called directly from the
generic fcntl code, and needs to use the same careful function that the
splice code is using.
Cc: Jens Axboe <jaxboe@fusionio.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+13
-12
+1
-1
fs/pipe.c
+1
-1
fs/pipe.c
-11
fs/splice.c
-11
fs/splice.c
···
1311
1311
static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
1312
1312
struct pipe_inode_info *opipe,
1313
1313
size_t len, unsigned int flags);
1314
-
/*
1315
-
* After the inode slimming patch, i_pipe/i_bdev/i_cdev share the same
1316
-
* location, so checking ->i_pipe is not enough to verify that this is a
1317
-
* pipe.
1318
-
*/
1319
-
static inline struct pipe_inode_info *get_pipe_info(struct file *file)
1320
-
{
1321
-
struct inode *i = file->f_path.dentry->d_inode;
1322
-
1323
-
return S_ISFIFO(i->i_mode) ? i->i_pipe : NULL;
1324
-
}
1325
1314
1326
1315
/*
1327
1316
* Determine where to splice to/from.
+12
include/linux/pipe_fs_i.h
+12
include/linux/pipe_fs_i.h
···
161
161
/* for F_SETPIPE_SZ and F_GETPIPE_SZ */
162
162
long pipe_fcntl(struct file *, unsigned int, unsigned long arg);
163
163
164
+
/*
165
+
* After the inode slimming patch, i_pipe/i_bdev/i_cdev share the same
166
+
* location, so checking ->i_pipe is not enough to verify that this is a
167
+
* pipe.
168
+
*/
169
+
static inline struct pipe_inode_info *get_pipe_info(struct file *file)
170
+
{
171
+
struct inode *i = file->f_path.dentry->d_inode;
172
+
173
+
return S_ISFIFO(i->i_mode) ? i->i_pipe : NULL;
174
+
}
175
+
164
176
#endif