Message ID | 20171012165808.GA2742@hercules.tuxera.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Oct 12, 2017 at 9:58 AM, Rakesh Pandit <rakesh@tuxera.com> wrote: > Replaced by pr_err usage in commit ef51042472f5 ("block, dax: move > "select DAX" from BLOCK to FS_DAX") > > Signed-off-by: Rakesh Pandit <rakesh@tuxera.com> > Acked-by: Ross Zwisler <ross.zwisler@linux.intel.com> > --- > > Al, May you consider queuing this for v4.15 ? Thank you. Should go through Jens, but if it lingers a few more days I'll grab it.
On 10/12/2017 12:11 PM, Dan Williams wrote: > On Thu, Oct 12, 2017 at 9:58 AM, Rakesh Pandit <rakesh@tuxera.com> wrote: >> Replaced by pr_err usage in commit ef51042472f5 ("block, dax: move >> "select DAX" from BLOCK to FS_DAX") >> >> Signed-off-by: Rakesh Pandit <rakesh@tuxera.com> >> Acked-by: Ross Zwisler <ross.zwisler@linux.intel.com> >> --- >> >> Al, May you consider queuing this for v4.15 ? Thank you. > > Should go through Jens, but if it lingers a few more days I'll grab it. I've picked it up.
diff --git a/fs/block_dev.c b/fs/block_dev.c index 93d088f..07ddccd 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -54,18 +54,6 @@ struct block_device *I_BDEV(struct inode *inode) } EXPORT_SYMBOL(I_BDEV); -void __vfs_msg(struct super_block *sb, const char *prefix, const char *fmt, ...) -{ - struct va_format vaf; - va_list args; - - va_start(args, fmt); - vaf.fmt = fmt; - vaf.va = &args; - printk_ratelimited("%sVFS (%s): %pV\n", prefix, sb->s_id, &vaf); - va_end(args); -} - static void bdev_write_inode(struct block_device *bdev) { struct inode *inode = bdev->bd_inode; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 02fa42d..a373246 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -922,17 +922,6 @@ static inline void rq_flush_dcache_pages(struct request *rq) } #endif -#ifdef CONFIG_PRINTK -#define vfs_msg(sb, level, fmt, ...) \ - __vfs_msg(sb, level, fmt, ##__VA_ARGS__) -#else -#define vfs_msg(sb, level, fmt, ...) \ -do { \ - no_printk(fmt, ##__VA_ARGS__); \ - __vfs_msg(sb, "", " "); \ -} while (0) -#endif - extern int blk_register_queue(struct gendisk *disk); extern void blk_unregister_queue(struct gendisk *disk); extern blk_qc_t generic_make_request(struct bio *bio);