forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: dm-user: Fix build warnings

Browse source 
Fix kernelci build warnings for 'allmodconfig' builds.

In file included from ../include/linux/printk.h:7,
                 from ../include/linux/kernel.h:16,
                 from ../include/linux/list.h:9,
                 from ../include/linux/wait.h:7,
                 from ../include/linux/wait_bit.h:8,
                 from ../include/linux/fs.h:6,
                 from ../include/linux/highmem.h:5,
                 from ../include/linux/bio.h:8,
                 from ../include/linux/device-mapper.h:11,
                 from ../drivers/md/dm-user.c:7:
../drivers/md/dm-user.c: In function ‘process_delayed_work’:
../include/linux/kern_levels.h:5:18: warning: format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘sector_t’ {aka ‘long long unsigned int’} [-Wformat=]
 #define KERN_SOH "\001"  /* ASCII Start Of Header */
                  ^~~~~~
../include/linux/kern_levels.h:11:18: note: in expansion of macro ‘KERN_SOH’
 #define KERN_ERR KERN_SOH "3" /* error conditions */
                  ^~~~~~~~
../include/linux/printk.h:348:9: note: in expansion of macro ‘KERN_ERR’
  printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
         ^~~~~~~~
../drivers/md/dm-user.c:222:2: note: in expansion of macro ‘pr_err’
  pr_err("IO error: sector %d: no user-space daemon for %s target\n",
  ^~~~~~
../drivers/md/dm-user.c:222:28: note: format string is defined here
  pr_err("IO error: sector %d: no user-space daemon for %s target\n",
                           ~^
                           %lld

Bug: 188362117
Test: Build
Reported-by: tkjos@google.com
Fixes: 9d80dbe0a3 ("ANDROID: dm-user: Fail the IO if there is no daemon")
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ia9fbac76616a8f8c743e16f0fc8ba0cd3e498b9e
This commit is contained in:
Akilesh Kailash 2021-05-26 17:33:36 +00:00
commit 347bb119f5
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/md/dm-user.c
View file

@ -219,8 +219,9 @@ static void process_delayed_work(struct work_struct *work)
* Terminate the IO with an error
*/
list_del(&msg->to_user);
pr_err("IO error: sector %d: no user-space daemon for %s target\n",
msg->bio->bi_iter.bi_sector, t->miscdev.name);
pr_err("I/O error: sector %llu: no user-space daemon for %s target\n",
msg->bio->bi_iter.bi_sector,
t->miscdev.name);
message_kill(msg, &t->message_pool);
mutex_unlock(&t->lock);
}