Messages in this thread | | | Date | Fri, 13 Jun 2014 22:56:22 +0800 | Subject | Re: [PATCH 1/1] firmware: read firmware size using i_size_read() | From | Ming Lei <> |
| |
On Fri, Jun 13, 2014 at 5:05 AM, Dmitry Kasatkin <dmitry.kasatkin@gmail.com> wrote: > There is no need to read attr because inode structure contains size > of the file. Use i_size_read() instead. > > Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com> > --- > drivers/base/firmware_class.c | 15 +-------------- > 1 file changed, 1 insertion(+), 14 deletions(-) > > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c > index c30df50e..9aaa97b 100644 > --- a/drivers/base/firmware_class.c > +++ b/drivers/base/firmware_class.c > @@ -279,26 +279,13 @@ static const char * const fw_path[] = { > module_param_string(path, fw_path_para, sizeof(fw_path_para), 0644); > MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path"); > > -/* Don't inline this: 'struct kstat' is biggish */ > -static noinline_for_stack int fw_file_size(struct file *file) > -{ > - struct kstat st; > - if (vfs_getattr(&file->f_path, &st)) > - return -1; > - if (!S_ISREG(st.mode)) > - return -1; > - if (st.size != (int)st.size) > - return -1; > - return st.size; > -} > - > static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) > { > int size; > char *buf; > int rc; > > - size = fw_file_size(file); > + size = i_size_read(file_inode(file)); > if (size <= 0) > return -EINVAL; > buf = vmalloc(size); > --
fw_file_size() not only return size of the file, but also check if it is a regular file, and its size.
Thanks, -- Ming Lei
| |