@@ -59,7 +59,7 @@ static struct kset *gfs2_kset;
5959
6060static ssize_t id_show (struct gfs2_sbd * sdp , char * buf )
6161{
62- return snprintf (buf , PAGE_SIZE , "%u:%u\n" ,
62+ return sysfs_emit (buf , "%u:%u\n" ,
6363 MAJOR (sdp -> sd_vfs -> s_dev ), MINOR (sdp -> sd_vfs -> s_dev ));
6464}
6565
@@ -68,7 +68,7 @@ static ssize_t status_show(struct gfs2_sbd *sdp, char *buf)
6868 unsigned long f = sdp -> sd_flags ;
6969 ssize_t s ;
7070
71- s = snprintf (buf , PAGE_SIZE ,
71+ s = sysfs_emit (buf ,
7272 "Journal Checked: %d\n"
7373 "Journal Live: %d\n"
7474 "Journal ID: %d\n"
@@ -140,7 +140,7 @@ static ssize_t status_show(struct gfs2_sbd *sdp, char *buf)
140140
141141static ssize_t fsname_show (struct gfs2_sbd * sdp , char * buf )
142142{
143- return snprintf (buf , PAGE_SIZE , "%s\n" , sdp -> sd_fsname );
143+ return sysfs_emit (buf , "%s\n" , sdp -> sd_fsname );
144144}
145145
146146static ssize_t uuid_show (struct gfs2_sbd * sdp , char * buf )
@@ -150,15 +150,15 @@ static ssize_t uuid_show(struct gfs2_sbd *sdp, char *buf)
150150 buf [0 ] = '\0' ;
151151 if (uuid_is_null (& s -> s_uuid ))
152152 return 0 ;
153- return snprintf (buf , PAGE_SIZE , "%pUB\n" , & s -> s_uuid );
153+ return sysfs_emit (buf , "%pUB\n" , & s -> s_uuid );
154154}
155155
156156static ssize_t freeze_show (struct gfs2_sbd * sdp , char * buf )
157157{
158158 struct super_block * sb = sdp -> sd_vfs ;
159159 int frozen = (sb -> s_writers .frozen == SB_UNFROZEN ) ? 0 : 1 ;
160160
161- return snprintf (buf , PAGE_SIZE , "%d\n" , frozen );
161+ return sysfs_emit (buf , "%d\n" , frozen );
162162}
163163
164164static ssize_t freeze_store (struct gfs2_sbd * sdp , const char * buf , size_t len )
@@ -194,7 +194,7 @@ static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
194194static ssize_t withdraw_show (struct gfs2_sbd * sdp , char * buf )
195195{
196196 unsigned int b = gfs2_withdrawing_or_withdrawn (sdp );
197- return snprintf (buf , PAGE_SIZE , "%u\n" , b );
197+ return sysfs_emit (buf , "%u\n" , b );
198198}
199199
200200static ssize_t withdraw_store (struct gfs2_sbd * sdp , const char * buf , size_t len )
@@ -397,7 +397,7 @@ static struct kobj_type gfs2_ktype = {
397397static ssize_t proto_name_show (struct gfs2_sbd * sdp , char * buf )
398398{
399399 const struct lm_lockops * ops = sdp -> sd_lockstruct .ls_ops ;
400- return sprintf (buf , "%s\n" , ops -> lm_proto_name );
400+ return sysfs_emit (buf , "%s\n" , ops -> lm_proto_name );
401401}
402402
403403static ssize_t block_show (struct gfs2_sbd * sdp , char * buf )
@@ -408,7 +408,7 @@ static ssize_t block_show(struct gfs2_sbd *sdp, char *buf)
408408
409409 if (test_bit (DFL_BLOCK_LOCKS , & ls -> ls_recover_flags ))
410410 val = 1 ;
411- ret = sprintf (buf , "%d\n" , val );
411+ ret = sysfs_emit (buf , "%d\n" , val );
412412 return ret ;
413413}
414414
@@ -459,7 +459,7 @@ static ssize_t wdack_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
459459static ssize_t lkfirst_show (struct gfs2_sbd * sdp , char * buf )
460460{
461461 struct lm_lockstruct * ls = & sdp -> sd_lockstruct ;
462- return sprintf (buf , "%d\n" , ls -> ls_first );
462+ return sysfs_emit (buf , "%d\n" , ls -> ls_first );
463463}
464464
465465static ssize_t lkfirst_store (struct gfs2_sbd * sdp , const char * buf , size_t len )
@@ -492,7 +492,7 @@ static ssize_t lkfirst_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
492492static ssize_t first_done_show (struct gfs2_sbd * sdp , char * buf )
493493{
494494 struct lm_lockstruct * ls = & sdp -> sd_lockstruct ;
495- return sprintf (buf , "%d\n" , !!test_bit (DFL_FIRST_MOUNT_DONE , & ls -> ls_recover_flags ));
495+ return sysfs_emit (buf , "%d\n" , !!test_bit (DFL_FIRST_MOUNT_DONE , & ls -> ls_recover_flags ));
496496}
497497
498498int gfs2_recover_set (struct gfs2_sbd * sdp , unsigned jid )
@@ -550,18 +550,18 @@ static ssize_t recover_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
550550static ssize_t recover_done_show (struct gfs2_sbd * sdp , char * buf )
551551{
552552 struct lm_lockstruct * ls = & sdp -> sd_lockstruct ;
553- return sprintf (buf , "%d\n" , ls -> ls_recover_jid_done );
553+ return sysfs_emit (buf , "%d\n" , ls -> ls_recover_jid_done );
554554}
555555
556556static ssize_t recover_status_show (struct gfs2_sbd * sdp , char * buf )
557557{
558558 struct lm_lockstruct * ls = & sdp -> sd_lockstruct ;
559- return sprintf (buf , "%d\n" , ls -> ls_recover_jid_status );
559+ return sysfs_emit (buf , "%d\n" , ls -> ls_recover_jid_status );
560560}
561561
562562static ssize_t jid_show (struct gfs2_sbd * sdp , char * buf )
563563{
564- return sprintf (buf , "%d\n" , sdp -> sd_lockstruct .ls_jid );
564+ return sysfs_emit (buf , "%d\n" , sdp -> sd_lockstruct .ls_jid );
565565}
566566
567567static ssize_t jid_store (struct gfs2_sbd * sdp , const char * buf , size_t len )
@@ -626,7 +626,7 @@ static struct attribute *lock_module_attrs[] = {
626626
627627static ssize_t quota_scale_show (struct gfs2_sbd * sdp , char * buf )
628628{
629- return snprintf (buf , PAGE_SIZE , "%u %u\n" ,
629+ return sysfs_emit (buf , "%u %u\n" ,
630630 sdp -> sd_tune .gt_quota_scale_num ,
631631 sdp -> sd_tune .gt_quota_scale_den );
632632}
@@ -679,7 +679,7 @@ static struct gfs2_attr tune_attr_##name = __ATTR(name, 0644, show, store)
679679#define TUNE_ATTR_2 (name , store ) \
680680static ssize_t name##_show(struct gfs2_sbd *sdp, char *buf) \
681681{ \
682- return snprintf (buf, PAGE_SIZE, "%u\n", sdp->sd_tune.gt_##name); \
682+ return sysfs_emit (buf, "%u\n", sdp->sd_tune.gt_##name); \
683683} \
684684TUNE_ATTR_3(name, name##_show, store)
685685
0 commit comments