projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
drivers
/
nvme
/
target
/
configfs.c
diff --git
a/drivers/nvme/target/configfs.c
b/drivers/nvme/target/configfs.c
index
2735551
..
d784f3c
100644
(file)
--- a/
drivers/nvme/target/configfs.c
+++ b/
drivers/nvme/target/configfs.c
@@
-1028,7
+1028,7
@@
nvmet_subsys_attr_version_store_locked(struct nvmet_subsys *subsys,
}
/* passthru subsystems use the underlying controller's version */
}
/* passthru subsystems use the underlying controller's version */
- if (nvmet_
passthru_ctrl
(subsys))
+ if (nvmet_
is_passthru_subsys
(subsys))
return -EINVAL;
ret = sscanf(page, "%d.%d.%d\n", &major, &minor, &tertiary);
return -EINVAL;
ret = sscanf(page, "%d.%d.%d\n", &major, &minor, &tertiary);
@@
-1067,7
+1067,8
@@
static ssize_t nvmet_subsys_attr_serial_show(struct config_item *item,
{
struct nvmet_subsys *subsys = to_subsys(item);
{
struct nvmet_subsys *subsys = to_subsys(item);
- return snprintf(page, PAGE_SIZE, "%s\n", subsys->serial);
+ return snprintf(page, PAGE_SIZE, "%*s\n",
+ NVMET_SN_MAX_SIZE, subsys->serial);
}
static ssize_t
}
static ssize_t