Skip to contentSkip to conversation

cifs: use a flexarray in cifs_writedata

PATCH Applied Jeff Layton 3 participants 3 messages Feb 7, 2014 – Feb 8, 2014 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cifs: use a flexarray in cifs_writedata

The cifs_writedata code uses a single element trailing array, which just adds unneeded complexity. Use a flexarray instead.

---
 fs/cifs/cifsglob.h | 2 +-
 fs/cifs/cifssmb.c  | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)
fs/cifs/cifsglob.h +1 -1
index 57d07e704d97..e7fe49e75cdb 100644
@@ -1064,7 +1064,7 @@ struct cifs_writedata {
 	unsigned int			pagesz;
 	unsigned int			tailsz;
 	unsigned int			nr_pages;
-	struct page			*pages[1];
+	struct page			*pages[];
 };
 
 /*
fs/cifs/cifssmb.c +1 -7
index 0726ab413b8c..a75b56025df7 100644
@@ -1962,15 +1962,9 @@ cifs_writedata_alloc(unsigned int nr_pages, work_func_t complete)
 {
 	struct cifs_writedata *wdata;
 
-	/* this would overflow */
-	if (nr_pages == 0) {
-		cifs_dbg(VFS, "%s: called with nr_pages == 0!\n", __func__);
-		return NULL;
-	}
-
 	/* writedata + number of page pointers */
 	wdata = kzalloc(sizeof(*wdata) +
-			sizeof(struct page *) * (nr_pages - 1), GFP_NOFS);
+			sizeof(struct page *) * nr_pages, GFP_NOFS);
 	if (wdata != NULL) {
 		kref_init(&wdata->refcount);
 		INIT_LIST_HEAD(&wdata->list);
Signature · 1 line
1.8.5.3

A message that is not in the archive (sent off-list or not yet received): 1391789044-26179-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

Reviewed-by
#2 lore raw

2014-02-07 20:04 GMT+04:00 Jeff Layton <[email protected]>:

Quoted 46 lines

The cifs_writedata code uses a single element trailing array, which just adds unneeded complexity. Use a flexarray instead.

---
 fs/cifs/cifsglob.h | 2 +-
 fs/cifs/cifssmb.c  | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)
fs/cifs/cifsglob.h +1 -1
index 57d07e704d97..e7fe49e75cdb 100644
@@ -1064,7 +1064,7 @@ struct cifs_writedata {
        unsigned int                    pagesz;
        unsigned int                    tailsz;
        unsigned int                    nr_pages;
-       struct page                     *pages[1];
+       struct page                     *pages[];
 };
 
 /*
fs/cifs/cifssmb.c +1 -8
index 0726ab413b8c..a75b56025df7 100644
@@ -1962,15 +1962,9 @@ cifs_writedata_alloc(unsigned int nr_pages, work_func_t complete)
 {
        struct cifs_writedata *wdata;
 
-       /* this would overflow */
-       if (nr_pages == 0) {
-               cifs_dbg(VFS, "%s: called with nr_pages == 0!\n", __func__);
-               return NULL;
-       }
-
        /* writedata + number of page pointers */
        wdata = kzalloc(sizeof(*wdata) +
-                       sizeof(struct page *) * (nr_pages - 1), GFP_NOFS);
+                       sizeof(struct page *) * nr_pages, GFP_NOFS);
        if (wdata != NULL) {
                kref_init(&wdata->refcount);
                INIT_LIST_HEAD(&wdata->list);
--

1.8.5.3

Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Reasonable.

Signature · 2 lines
Best regards,
Pavel Shilovsky.
Applied
#3 lore raw
In reply to a message not in the archive

merged into cifs-2.6.git for-next

Quoted 46 lines · Jeff Layton

The cifs_writedata code uses a single element trailing array, which just adds unneeded complexity. Use a flexarray instead.

---
 fs/cifs/cifsglob.h | 2 +-
 fs/cifs/cifssmb.c  | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)
fs/cifs/cifsglob.h +1 -1
index 57d07e704d97..e7fe49e75cdb 100644
@@ -1064,7 +1064,7 @@ struct cifs_writedata {
        unsigned int                    pagesz;
        unsigned int                    tailsz;
        unsigned int                    nr_pages;
-       struct page                     *pages[1];
+       struct page                     *pages[];
 };
 
 /*
fs/cifs/cifssmb.c +1 -8
index 0726ab413b8c..a75b56025df7 100644
@@ -1962,15 +1962,9 @@ cifs_writedata_alloc(unsigned int nr_pages, work_func_t complete)
 {
        struct cifs_writedata *wdata;
 
-       /* this would overflow */
-       if (nr_pages == 0) {
-               cifs_dbg(VFS, "%s: called with nr_pages == 0!\n", __func__);
-               return NULL;
-       }
-
        /* writedata + number of page pointers */
        wdata = kzalloc(sizeof(*wdata) +
-                       sizeof(struct page *) * (nr_pages - 1), GFP_NOFS);
+                       sizeof(struct page *) * nr_pages, GFP_NOFS);
        if (wdata != NULL) {
                kref_init(&wdata->refcount);
                INIT_LIST_HEAD(&wdata->list);
--

1.8.5.3

Signature · 3 lines
Thanks,

Steve