projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new helper: file_inode(file)
[deliverable/linux.git]
/
fs
/
pipe.c
diff --git
a/fs/pipe.c
b/fs/pipe.c
index bd3479db4b624e4f9e9d5fcdbf95dc46acb9545f..39baf6c3ebb0f3046ef8bc5939f391b062091925 100644
(file)
--- a/
fs/pipe.c
+++ b/
fs/pipe.c
@@
-361,7
+361,7
@@
pipe_read(struct kiocb *iocb, const struct iovec *_iov,
unsigned long nr_segs, loff_t pos)
{
struct file *filp = iocb->ki_filp;
unsigned long nr_segs, loff_t pos)
{
struct file *filp = iocb->ki_filp;
- struct inode *inode = fil
p->f_path.dentry->d_inode
;
+ struct inode *inode = fil
e_inode(filp)
;
struct pipe_inode_info *pipe;
int do_wakeup;
ssize_t ret;
struct pipe_inode_info *pipe;
int do_wakeup;
ssize_t ret;
@@
-486,7
+486,7
@@
pipe_write(struct kiocb *iocb, const struct iovec *_iov,
unsigned long nr_segs, loff_t ppos)
{
struct file *filp = iocb->ki_filp;
unsigned long nr_segs, loff_t ppos)
{
struct file *filp = iocb->ki_filp;
- struct inode *inode = fil
p->f_path.dentry->d_inode
;
+ struct inode *inode = fil
e_inode(filp)
;
struct pipe_inode_info *pipe;
ssize_t ret;
int do_wakeup;
struct pipe_inode_info *pipe;
ssize_t ret;
int do_wakeup;
@@
-677,7
+677,7
@@
bad_pipe_w(struct file *filp, const char __user *buf, size_t count,
static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
- struct inode *inode = fil
p->f_path.dentry->d_inode
;
+ struct inode *inode = fil
e_inode(filp)
;
struct pipe_inode_info *pipe;
int count, buf, nrbufs;
struct pipe_inode_info *pipe;
int count, buf, nrbufs;
@@
-705,7
+705,7
@@
static unsigned int
pipe_poll(struct file *filp, poll_table *wait)
{
unsigned int mask;
pipe_poll(struct file *filp, poll_table *wait)
{
unsigned int mask;
- struct inode *inode = fil
p->f_path.dentry->d_inode
;
+ struct inode *inode = fil
e_inode(filp)
;
struct pipe_inode_info *pipe = inode->i_pipe;
int nrbufs;
struct pipe_inode_info *pipe = inode->i_pipe;
int nrbufs;
@@
-758,7
+758,7
@@
pipe_release(struct inode *inode, int decr, int decw)
static int
pipe_read_fasync(int fd, struct file *filp, int on)
{
static int
pipe_read_fasync(int fd, struct file *filp, int on)
{
- struct inode *inode = fil
p->f_path.dentry->d_inode
;
+ struct inode *inode = fil
e_inode(filp)
;
int retval;
mutex_lock(&inode->i_mutex);
int retval;
mutex_lock(&inode->i_mutex);
@@
-772,7
+772,7
@@
pipe_read_fasync(int fd, struct file *filp, int on)
static int
pipe_write_fasync(int fd, struct file *filp, int on)
{
static int
pipe_write_fasync(int fd, struct file *filp, int on)
{
- struct inode *inode = fil
p->f_path.dentry->d_inode
;
+ struct inode *inode = fil
e_inode(filp)
;
int retval;
mutex_lock(&inode->i_mutex);
int retval;
mutex_lock(&inode->i_mutex);
@@
-786,7
+786,7
@@
pipe_write_fasync(int fd, struct file *filp, int on)
static int
pipe_rdwr_fasync(int fd, struct file *filp, int on)
{
static int
pipe_rdwr_fasync(int fd, struct file *filp, int on)
{
- struct inode *inode = fil
p->f_path.dentry->d_inode
;
+ struct inode *inode = fil
e_inode(filp)
;
struct pipe_inode_info *pipe = inode->i_pipe;
int retval;
struct pipe_inode_info *pipe = inode->i_pipe;
int retval;
@@
-1226,7
+1226,7
@@
int pipe_proc_fn(struct ctl_table *table, int write, void __user *buf,
*/
struct pipe_inode_info *get_pipe_info(struct file *file)
{
*/
struct pipe_inode_info *get_pipe_info(struct file *file)
{
- struct inode *i = file
->f_path.dentry->d_inode
;
+ struct inode *i = file
_inode(file)
;
return S_ISFIFO(i->i_mode) ? i->i_pipe : NULL;
}
return S_ISFIFO(i->i_mode) ? i->i_pipe : NULL;
}
This page took
0.025894 seconds
and
5
git commands to generate.