| Message ID | 20190711140012.1671-3-jack@suse.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xfs: Fix races between readahead and hole punching | expand |
On Thu, Jul 11, 2019 at 04:00:11PM +0200, Jan Kara wrote: > Filesystems will need to call this function from their fadvise handlers. > > CC: stable@vger.kernel.org # Needed by "xfs: Fix stale data exposure when > readahead races with hole punch" > Signed-off-by: Jan Kara <jack@suse.cz> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > include/linux/fs.h | 2 ++ > mm/fadvise.c | 4 ++-- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/include/linux/fs.h b/include/linux/fs.h > index f7fdfe93e25d..2666862ff00d 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -3536,6 +3536,8 @@ extern void inode_nohighmem(struct inode *inode); > /* mm/fadvise.c */ > extern int vfs_fadvise(struct file *file, loff_t offset, loff_t len, > int advice); > +extern int generic_fadvise(struct file *file, loff_t offset, loff_t len, > + int advice); > > #if defined(CONFIG_IO_URING) > extern struct sock *io_uring_get_socket(struct file *file); > diff --git a/mm/fadvise.c b/mm/fadvise.c > index 467bcd032037..4f17c83db575 100644 > --- a/mm/fadvise.c > +++ b/mm/fadvise.c > @@ -27,8 +27,7 @@ > * deactivate the pages and clear PG_Referenced. > */ > > -static int generic_fadvise(struct file *file, loff_t offset, loff_t len, > - int advice) > +int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice) > { > struct inode *inode; > struct address_space *mapping; > @@ -178,6 +177,7 @@ static int generic_fadvise(struct file *file, loff_t offset, loff_t len, > } > return 0; > } > +EXPORT_SYMBOL(generic_fadvise); > > int vfs_fadvise(struct file *file, loff_t offset, loff_t len, int advice) > { > -- > 2.16.4 >
diff --git a/include/linux/fs.h b/include/linux/fs.h index f7fdfe93e25d..2666862ff00d 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3536,6 +3536,8 @@ extern void inode_nohighmem(struct inode *inode); /* mm/fadvise.c */ extern int vfs_fadvise(struct file *file, loff_t offset, loff_t len, int advice); +extern int generic_fadvise(struct file *file, loff_t offset, loff_t len, + int advice); #if defined(CONFIG_IO_URING) extern struct sock *io_uring_get_socket(struct file *file); diff --git a/mm/fadvise.c b/mm/fadvise.c index 467bcd032037..4f17c83db575 100644 --- a/mm/fadvise.c +++ b/mm/fadvise.c @@ -27,8 +27,7 @@ * deactivate the pages and clear PG_Referenced. */ -static int generic_fadvise(struct file *file, loff_t offset, loff_t len, - int advice) +int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice) { struct inode *inode; struct address_space *mapping; @@ -178,6 +177,7 @@ static int generic_fadvise(struct file *file, loff_t offset, loff_t len, } return 0; } +EXPORT_SYMBOL(generic_fadvise); int vfs_fadvise(struct file *file, loff_t offset, loff_t len, int advice) {
Filesystems will need to call this function from their fadvise handlers. CC: stable@vger.kernel.org # Needed by "xfs: Fix stale data exposure when readahead races with hole punch" Signed-off-by: Jan Kara <jack@suse.cz> --- include/linux/fs.h | 2 ++ mm/fadvise.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)