fs: keep dio_warn_stale_pagecache() when CONFIG_BLOCK=n
Subsystems (3)
PATCH 1/1 fs: keep dio_warn_stale_pagecache() when CONFIG_BLOCK=n
This helper prints warning if direct I/O write failed to invalidate cache. Direct I/O is supported by non-disk filesystems, for example NFS.
Signed-off-by Konstantin Khlebnikov <[email protected]>
--- fs/direct-io.c | 21 --------------------- include/linux/fs.h | 6 +++++- mm/filemap.c | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 22 deletions(-)
fs/direct-io.c +0 -21
@@ -220,27 +220,6 @@ static inline struct page *dio_get_page(struct dio *dio,return dio->pages[sdio->head]; } -/* -* Warn about a page cache invalidation failure during a direct io write. -*/ -void dio_warn_stale_pagecache (struct file *filp) -{ - static DEFINE_RATELIMIT_STATE(_rs, 86400 * HZ, DEFAULT_RATELIMIT_BURST); -char pathname[128 ]; -struct inode *inode =file_inode (filp); -char *path; - -errseq_set (&inode->i_mapping->wb_err, -EIO ); -if (__ratelimit (&_rs)) { - path =file_path (filp, pathname,sizeof (pathname)); -if (IS_ERR (path)) - path ="(unknown)" ; -pr_crit ("Page cache invalidation failure on direct I/O. Possible data corruption due to collision with buffered I/O!\n" ); -pr_crit ("File: %s PID: %d Comm: %.20s\n" , path, current->pid, - current->comm); - } -} -/* * dio_complete() - called when all DIO BIO I/O has been completed *
include/linux/fs.h +5 -1
@@ -3153,7 +3153,6 @@ enum { };void dio_end_io (struct bio *bio); -void dio_warn_stale_pagecache (struct file *filp); ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, struct block_device *bdev, struct iov_iter *iter,
@@ -3198,6 +3197,11 @@ static inline void inode_dio_end(struct inode *inode)wake_up_bit (&inode->i_state, __I_DIO_WAKEUP); } +/* +* Warn about a page cache invalidation failure diring a direct I/O write. +*/ +void dio_warn_stale_pagecache (struct file *filp); +extern void inode_set_flags (struct inode *inode,unsigned int flags,unsigned int mask);
mm/filemap.c +21 -0
@@ -3161,6 +3161,27 @@ int pagecache_write_end(struct file *file, struct address_space *mapping, }EXPORT_SYMBOL (pagecache_write_end); +/* +* Warn about a page cache invalidation failure during a direct I/O write. +*/ +void dio_warn_stale_pagecache (struct file *filp) +{ + static DEFINE_RATELIMIT_STATE(_rs, 86400 * HZ, DEFAULT_RATELIMIT_BURST); +char pathname[128 ]; +struct inode *inode =file_inode (filp); +char *path; + +errseq_set (&inode->i_mapping->wb_err, -EIO ); +if (__ratelimit (&_rs)) { + path =file_path (filp, pathname,sizeof (pathname)); +if (IS_ERR (path)) + path ="(unknown)" ; +pr_crit ("Page cache invalidation failure on direct I/O. Possible data corruption due to collision with buffered I/O!\n" ); +pr_crit ("File: %s PID: %d Comm: %.20s\n" , path, current->pid, + current->comm); + } +} +ssize_t generic_file_direct_write (struct kiocb *iocb,struct iov_iter *from) {
Jan Kara
maintainerQuoted 5 lines · Konstantin Khlebnikov
This helper prints warning if direct I/O write failed to invalidate cache. Direct I/O is supported by non-disk filesystems, for example NFS.
Well, but this patch doesn't quite make sense without your other patch so it would make sense to explain that in the changelog and make this patch 1/2 while the other patch will be 2/2? Otherwise those changes make sense to me.
Honza
Quoted 95 lines
--- fs/direct-io.c | 21 --------------------- include/linux/fs.h | 6 +++++- mm/filemap.c | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 22 deletions(-)fs/direct-io.c +0
-21@@ -220,27 +220,6 @@ static inline struct page *dio_get_page(struct dio *dio,return dio->pages[sdio->head]; } -/* -* Warn about a page cache invalidation failure during a direct io write. -*/ -void dio_warn_stale_pagecache (struct file *filp) -{ - static DEFINE_RATELIMIT_STATE(_rs, 86400 * HZ, DEFAULT_RATELIMIT_BURST); -char pathname[128 ]; -struct inode *inode =file_inode (filp); -char *path; - -errseq_set (&inode->i_mapping->wb_err, -EIO ); -if (__ratelimit (&_rs)) { - path =file_path (filp, pathname,sizeof (pathname)); -if (IS_ERR (path)) - path ="(unknown)" ; -pr_crit ("Page cache invalidation failure on direct I/O. Possible data corruption due to collision with buffered I/O!\n" ); -pr_crit ("File: %s PID: %d Comm: %.20s\n" , path, current->pid, - current->comm); - } -} -/* * dio_complete() - called when all DIO BIO I/O has been completed * include/linux/fs.h +5
-1@@ -3153,7 +3153,6 @@ enum { };void dio_end_io (struct bio *bio); -void dio_warn_stale_pagecache (struct file *filp); ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, struct block_device *bdev, struct iov_iter *iter,@@ -3198,6 +3197,11 @@ static inline void inode_dio_end(struct inode *inode)wake_up_bit (&inode->i_state, __I_DIO_WAKEUP); } +/* +* Warn about a page cache invalidation failure diring a direct I/O write. +*/ +void dio_warn_stale_pagecache (struct file *filp); +extern void inode_set_flags (struct inode *inode,unsigned int flags,unsigned int mask);mm/filemap.c +21
-0@@ -3161,6 +3161,27 @@ int pagecache_write_end(struct file *file, struct address_space *mapping, }EXPORT_SYMBOL (pagecache_write_end); +/* +* Warn about a page cache invalidation failure during a direct I/O write. +*/ +void dio_warn_stale_pagecache (struct file *filp) +{ + static DEFINE_RATELIMIT_STATE(_rs, 86400 * HZ, DEFAULT_RATELIMIT_BURST); +char pathname[128 ]; +struct inode *inode =file_inode (filp); +char *path; + +errseq_set (&inode->i_mapping->wb_err, -EIO ); +if (__ratelimit (&_rs)) { + path =file_path (filp, pathname,sizeof (pathname)); +if (IS_ERR (path)) + path ="(unknown)" ; +pr_crit ("Page cache invalidation failure on direct I/O. Possible data corruption due to collision with buffered I/O!\n" ); +pr_crit ("File: %s PID: %d Comm: %.20s\n" , path, current->pid, + current->comm); + } +} +ssize_t generic_file_direct_write (struct kiocb *iocb,struct iov_iter *from) {
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR