| Message ID | 20170524164150.9492-2-rgoldwyn@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed 24-05-17 11:41:41, Goldwyn Rodrigues wrote: > From: Goldwyn Rodrigues <rgoldwyn@suse.com> > > Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> Looks good. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/read_write.c | 12 +++--------- > include/linux/fs.h | 14 ++++++++++++++ > 2 files changed, 17 insertions(+), 9 deletions(-) > > diff --git a/fs/read_write.c b/fs/read_write.c > index 47c1d4484df9..53c816c61122 100644 > --- a/fs/read_write.c > +++ b/fs/read_write.c > @@ -678,16 +678,10 @@ static ssize_t do_iter_readv_writev(struct file *filp, struct iov_iter *iter, > struct kiocb kiocb; > ssize_t ret; > > - if (flags & ~(RWF_HIPRI | RWF_DSYNC | RWF_SYNC)) > - return -EOPNOTSUPP; > - > init_sync_kiocb(&kiocb, filp); > - if (flags & RWF_HIPRI) > - kiocb.ki_flags |= IOCB_HIPRI; > - if (flags & RWF_DSYNC) > - kiocb.ki_flags |= IOCB_DSYNC; > - if (flags & RWF_SYNC) > - kiocb.ki_flags |= (IOCB_DSYNC | IOCB_SYNC); > + ret = kiocb_set_rw_flags(&kiocb, flags); > + if (ret) > + return ret; > kiocb.ki_pos = *ppos; > > if (type == READ) > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 803e5a9b2654..f53867140f43 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -3056,6 +3056,20 @@ static inline int iocb_flags(struct file *file) > return res; > } > > +static inline int kiocb_set_rw_flags(struct kiocb *ki, int flags) > +{ > + if (unlikely(flags & ~(RWF_HIPRI | RWF_DSYNC | RWF_SYNC))) > + return -EOPNOTSUPP; > + > + if (flags & RWF_HIPRI) > + ki->ki_flags |= IOCB_HIPRI; > + if (flags & RWF_DSYNC) > + ki->ki_flags |= IOCB_DSYNC; > + if (flags & RWF_SYNC) > + ki->ki_flags |= (IOCB_DSYNC | IOCB_SYNC); > + return 0; > +} > + > static inline ino_t parent_ino(struct dentry *dentry) > { > ino_t res; > -- > 2.12.0 >
diff --git a/fs/read_write.c b/fs/read_write.c index 47c1d4484df9..53c816c61122 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -678,16 +678,10 @@ static ssize_t do_iter_readv_writev(struct file *filp, struct iov_iter *iter, struct kiocb kiocb; ssize_t ret; - if (flags & ~(RWF_HIPRI | RWF_DSYNC | RWF_SYNC)) - return -EOPNOTSUPP; - init_sync_kiocb(&kiocb, filp); - if (flags & RWF_HIPRI) - kiocb.ki_flags |= IOCB_HIPRI; - if (flags & RWF_DSYNC) - kiocb.ki_flags |= IOCB_DSYNC; - if (flags & RWF_SYNC) - kiocb.ki_flags |= (IOCB_DSYNC | IOCB_SYNC); + ret = kiocb_set_rw_flags(&kiocb, flags); + if (ret) + return ret; kiocb.ki_pos = *ppos; if (type == READ) diff --git a/include/linux/fs.h b/include/linux/fs.h index 803e5a9b2654..f53867140f43 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3056,6 +3056,20 @@ static inline int iocb_flags(struct file *file) return res; } +static inline int kiocb_set_rw_flags(struct kiocb *ki, int flags) +{ + if (unlikely(flags & ~(RWF_HIPRI | RWF_DSYNC | RWF_SYNC))) + return -EOPNOTSUPP; + + if (flags & RWF_HIPRI) + ki->ki_flags |= IOCB_HIPRI; + if (flags & RWF_DSYNC) + ki->ki_flags |= IOCB_DSYNC; + if (flags & RWF_SYNC) + ki->ki_flags |= (IOCB_DSYNC | IOCB_SYNC); + return 0; +} + static inline ino_t parent_ino(struct dentry *dentry) { ino_t res;