@@ -227,17 +227,17 @@ static ssize_t state_show(struct kobject *kobj,
227
227
228
228
switch (dev -> dev_state ) {
229
229
case DEV_STATE_INIT :
230
- return snprintf (page , PAGE_SIZE , "init\n" );
230
+ return sysfs_emit (page , "init\n" );
231
231
case DEV_STATE_MAPPED :
232
232
/* TODO fix cli tool before changing to proper state */
233
- return snprintf (page , PAGE_SIZE , "open\n" );
233
+ return sysfs_emit (page , "open\n" );
234
234
case DEV_STATE_MAPPED_DISCONNECTED :
235
235
/* TODO fix cli tool before changing to proper state */
236
- return snprintf (page , PAGE_SIZE , "closed\n" );
236
+ return sysfs_emit (page , "closed\n" );
237
237
case DEV_STATE_UNMAPPED :
238
- return snprintf (page , PAGE_SIZE , "unmapped\n" );
238
+ return sysfs_emit (page , "unmapped\n" );
239
239
default :
240
- return snprintf (page , PAGE_SIZE , "unknown\n" );
240
+ return sysfs_emit (page , "unknown\n" );
241
241
}
242
242
}
243
243
@@ -263,7 +263,7 @@ static ssize_t mapping_path_show(struct kobject *kobj,
263
263
264
264
dev = container_of (kobj , struct rnbd_clt_dev , kobj );
265
265
266
- return scnprintf (page , PAGE_SIZE , "%s\n" , dev -> pathname );
266
+ return sysfs_emit (page , "%s\n" , dev -> pathname );
267
267
}
268
268
269
269
static struct kobj_attribute rnbd_clt_mapping_path_attr =
@@ -276,8 +276,7 @@ static ssize_t access_mode_show(struct kobject *kobj,
276
276
277
277
dev = container_of (kobj , struct rnbd_clt_dev , kobj );
278
278
279
- return snprintf (page , PAGE_SIZE , "%s\n" ,
280
- rnbd_access_mode_str (dev -> access_mode ));
279
+ return sysfs_emit (page , "%s\n" , rnbd_access_mode_str (dev -> access_mode ));
281
280
}
282
281
283
282
static struct kobj_attribute rnbd_clt_access_mode =
@@ -286,8 +285,8 @@ static struct kobj_attribute rnbd_clt_access_mode =
286
285
static ssize_t rnbd_clt_unmap_dev_show (struct kobject * kobj ,
287
286
struct kobj_attribute * attr , char * page )
288
287
{
289
- return scnprintf (page , PAGE_SIZE , "Usage: echo <normal|force> > %s\n" ,
290
- attr -> attr .name );
288
+ return sysfs_emit (page , "Usage: echo <normal|force> > %s\n" ,
289
+ attr -> attr .name );
291
290
}
292
291
293
292
static ssize_t rnbd_clt_unmap_dev_store (struct kobject * kobj ,
@@ -357,9 +356,8 @@ static ssize_t rnbd_clt_resize_dev_show(struct kobject *kobj,
357
356
struct kobj_attribute * attr ,
358
357
char * page )
359
358
{
360
- return scnprintf (page , PAGE_SIZE ,
361
- "Usage: echo <new size in sectors> > %s\n" ,
362
- attr -> attr .name );
359
+ return sysfs_emit (page , "Usage: echo <new size in sectors> > %s\n" ,
360
+ attr -> attr .name );
363
361
}
364
362
365
363
static ssize_t rnbd_clt_resize_dev_store (struct kobject * kobj ,
@@ -390,8 +388,7 @@ static struct kobj_attribute rnbd_clt_resize_dev_attr =
390
388
static ssize_t rnbd_clt_remap_dev_show (struct kobject * kobj ,
391
389
struct kobj_attribute * attr , char * page )
392
390
{
393
- return scnprintf (page , PAGE_SIZE , "Usage: echo <1> > %s\n" ,
394
- attr -> attr .name );
391
+ return sysfs_emit (page , "Usage: echo <1> > %s\n" , attr -> attr .name );
395
392
}
396
393
397
394
static ssize_t rnbd_clt_remap_dev_store (struct kobject * kobj ,
@@ -436,7 +433,7 @@ static ssize_t session_show(struct kobject *kobj, struct kobj_attribute *attr,
436
433
437
434
dev = container_of (kobj , struct rnbd_clt_dev , kobj );
438
435
439
- return scnprintf (page , PAGE_SIZE , "%s\n" , dev -> sess -> sessname );
436
+ return sysfs_emit (page , "%s\n" , dev -> sess -> sessname );
440
437
}
441
438
442
439
static struct kobj_attribute rnbd_clt_session_attr =
@@ -499,8 +496,8 @@ static ssize_t rnbd_clt_map_device_show(struct kobject *kobj,
499
496
struct kobj_attribute * attr ,
500
497
char * page )
501
498
{
502
- return scnprintf (page , PAGE_SIZE ,
503
- "Usage: echo \"[dest_port=server port number] sessname=<name of the rtrs session> path=<[srcaddr@]dstaddr> [path=<[srcaddr@]dstaddr>] device_path=<full path on remote side> [access_mode=<ro|rw|migration>] [nr_poll_queues=<number of queues>]\" > %s\n\naddr ::= [ ip:<ipv4> | ip:<ipv6> | gid:<gid> ]\n" ,
499
+ return sysfs_emit (page ,
500
+ "Usage: echo \"[dest_port=server port number] sessname=<name of the rtrs session> path=<[srcaddr@]dstaddr> [path=<[srcaddr@]dstaddr>] device_path=<full path on remote side> [access_mode=<ro|rw|migration>] [nr_poll_queues=<number of queues>]\" > %s\n\naddr ::= [ ip:<ipv4> | ip:<ipv6> | gid:<gid> ]\n" ,
504
501
attr -> attr .name );
505
502
}
506
503
0 commit comments