diff options
Diffstat (limited to 'drivers/target/target_core_stat.c')
| -rw-r--r-- | drivers/target/target_core_stat.c | 16 | 
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/target/target_core_stat.c b/drivers/target/target_core_stat.c index 9c642e02cba..03538994d2f 100644 --- a/drivers/target/target_core_stat.c +++ b/drivers/target/target_core_stat.c @@ -32,7 +32,6 @@  #include <linux/utsname.h>  #include <linux/proc_fs.h>  #include <linux/seq_file.h> -#include <linux/blkdev.h>  #include <linux/configfs.h>  #include <scsi/scsi.h>  #include <scsi/scsi_device.h> @@ -214,7 +213,8 @@ static ssize_t target_stat_scsi_tgt_dev_show_attr_resets(  	struct se_device *dev =  		container_of(sgrps, struct se_device, dev_stat_grps); -	return snprintf(page, PAGE_SIZE, "%u\n", dev->num_resets); +	return snprintf(page, PAGE_SIZE, "%lu\n", +			atomic_long_read(&dev->num_resets));  }  DEV_STAT_SCSI_TGT_DEV_ATTR_RO(resets); @@ -397,8 +397,8 @@ static ssize_t target_stat_scsi_lu_show_attr_num_cmds(  		container_of(sgrps, struct se_device, dev_stat_grps);  	/* scsiLuNumCommands */ -	return snprintf(page, PAGE_SIZE, "%llu\n", -			(unsigned long long)dev->num_cmds); +	return snprintf(page, PAGE_SIZE, "%lu\n", +			atomic_long_read(&dev->num_cmds));  }  DEV_STAT_SCSI_LU_ATTR_RO(num_cmds); @@ -409,7 +409,8 @@ static ssize_t target_stat_scsi_lu_show_attr_read_mbytes(  		container_of(sgrps, struct se_device, dev_stat_grps);  	/* scsiLuReadMegaBytes */ -	return snprintf(page, PAGE_SIZE, "%u\n", (u32)(dev->read_bytes >> 20)); +	return snprintf(page, PAGE_SIZE, "%lu\n", +			atomic_long_read(&dev->read_bytes) >> 20);  }  DEV_STAT_SCSI_LU_ATTR_RO(read_mbytes); @@ -420,7 +421,8 @@ static ssize_t target_stat_scsi_lu_show_attr_write_mbytes(  		container_of(sgrps, struct se_device, dev_stat_grps);  	/* scsiLuWrittenMegaBytes */ -	return snprintf(page, PAGE_SIZE, "%u\n", (u32)(dev->write_bytes >> 20)); +	return snprintf(page, PAGE_SIZE, "%lu\n", +			atomic_long_read(&dev->write_bytes) >> 20);  }  DEV_STAT_SCSI_LU_ATTR_RO(write_mbytes); @@ -431,7 +433,7 @@ static ssize_t target_stat_scsi_lu_show_attr_resets(  		container_of(sgrps, struct se_device, dev_stat_grps);  	/* scsiLuInResets */ -	return snprintf(page, PAGE_SIZE, "%u\n", dev->num_resets); +	return snprintf(page, PAGE_SIZE, "%lu\n", atomic_long_read(&dev->num_resets));  }  DEV_STAT_SCSI_LU_ATTR_RO(resets);  | 
