!1013 fix: 同步修复shell_lk.c告警清零带来的逻辑修改

Merge pull request !1013 from 夏不白/cherry-pick-1664185256

fs/jffs2/jffs2.patch

@@ -2311,7 +2311,7 @@ diff -Nupr old/fs/jffs2/erase.c new/fs/jffs2/erase.c
 diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 --- old/fs/jffs2/file.c	2022-05-09 17:22:53.000000000 +0800
 +++ new/fs/jffs2/file.c	2022-05-10 09:43:14.250000000 +0800
-@@ -9,335 +9,30 @@
+@@ -9,325 +9,34 @@
   * For licensing information, see the file 'LICENCE' in this directory.
   *
   */
@@ -2336,35 +2336,32 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -			loff_t pos, unsigned len, unsigned flags,
 -			struct page **pagep, void **fsdata);
 -static int jffs2_readpage (struct file *filp, struct page *pg);
+-
+-int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
+-{
+-	struct inode *inode = filp->f_mapping->host;
+-	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
+-	int ret;
+-
+-	ret = file_write_and_wait_range(filp, start, end);
+-	if (ret)
+-		return ret;
+ 
+-	inode_lock(inode);
+-	/* Trigger GC to flush any pending writes for this inode */
+-	jffs2_flush_wbuf_gc(c, inode->i_ino);
+-	inode_unlock(inode);
 +static unsigned char gc_buffer[PAGE_SIZE];	//avoids malloc when user may be under memory pressure
  
--int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
+-	return 0;
+-}
+ 
+-const struct file_operations jffs2_file_operations =
 +unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
 +				   struct jffs2_inode_info *f,
 +				   unsigned long offset,
 +				   unsigned long *priv)
  {
--	struct inode *inode = filp->f_mapping->host;
--	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
-+	/* FIXME: This works only with one file system mounted at a time */
- 	int ret;
--
--	ret = file_write_and_wait_range(filp, start, end);
-+	ret = jffs2_read_inode_range(c, f, gc_buffer,
-+			 offset & ~(PAGE_SIZE-1), PAGE_SIZE);
- 	if (ret)
--		return ret;
--
--	inode_lock(inode);
--	/* Trigger GC to flush any pending writes for this inode */
--	jffs2_flush_wbuf_gc(c, inode->i_ino);
--	inode_unlock(inode);
--
--	return 0;
--}
--
--const struct file_operations jffs2_file_operations =
--{
 -	.llseek =	generic_file_llseek,
 -	.open =		generic_file_open,
 - 	.read_iter =	generic_file_read_iter,
@@ -2398,8 +2395,9 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
 -	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
 -	unsigned char *pg_buf;
--	int ret;
--
++	/* FIXME: This works only with one file system mounted at a time */
+ 	int ret;
+ 
 -	jffs2_dbg(2, "%s(): ino #%lu, page at offset 0x%lx\n",
 -		  __func__, inode->i_ino, pg->index << PAGE_SHIFT);
 -
@@ -2438,15 +2436,18 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -{
 -	struct jffs2_inode_info *f = JFFS2_INODE_INFO(pg->mapping->host);
 -	int ret;
--
++	ret = jffs2_read_inode_range(c, f, gc_buffer,
++			 offset & ~(PAGE_SIZE-1), PAGE_SIZE);
++	if (ret)
++		return ERR_PTR(ret);
+ 
 -	mutex_lock(&f->sem);
 -	ret = jffs2_do_readpage_unlock(pg->mapping->host, pg);
 -	mutex_unlock(&f->sem);
 -	return ret;
-+		return ERR_PTR(ret);
 +	return gc_buffer;
  }
- 
+-
 -static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
 -			loff_t pos, unsigned len, unsigned flags,
 -			struct page **pagep, void **fsdata)
@@ -2457,15 +2458,20 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -	struct page *pg;
 -	struct inode *inode = mapping->host;
 -	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
--	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
 -	pgoff_t index = pos >> PAGE_SHIFT;
 -	uint32_t pageofs = index << PAGE_SHIFT;
 -	int ret = 0;
 -
+-	pg = grab_cache_page_write_begin(mapping, index, flags);
+-	if (!pg)
+-		return -ENOMEM;
+-	*pagep = pg;
+-
 -	jffs2_dbg(1, "%s()\n", __func__);
 -
 -	if (pageofs > inode->i_size) {
 -		/* Make new hole frag from old EOF to new page */
+-		struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
 -		struct jffs2_raw_inode ri;
 -		struct jffs2_full_dnode *fn;
 -		uint32_t alloc_len;
@@ -2476,7 +2482,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -		ret = jffs2_reserve_space(c, sizeof(ri), &alloc_len,
 -					  ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);
 -		if (ret)
--			goto out_err;
+-			goto out_page;
 -
 -		mutex_lock(&f->sem);
 -		memset(&ri, 0, sizeof(ri));
@@ -2506,7 +2512,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -			ret = PTR_ERR(fn);
 -			jffs2_complete_reservation(c);
 -			mutex_unlock(&f->sem);
--			goto out_err;
+-			goto out_page;
 -		}
 -		ret = jffs2_add_full_dnode_to_inode(c, f, fn);
 -		if (f->metadata) {
@@ -2521,7 +2527,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -			jffs2_free_full_dnode(fn);
 -			jffs2_complete_reservation(c);
 -			mutex_unlock(&f->sem);
--			goto out_err;
+-			goto out_page;
 -		}
 -		jffs2_complete_reservation(c);
 -		inode->i_size = pageofs;
@@ -2529,19 +2535,6 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -	}
 -
 -	/*
--	 * While getting a page and reading data in, lock c->alloc_sem until
--	 * the page is Uptodate. Otherwise GC task may attempt to read the same
--	 * page in read_cache_page(), which causes a deadlock.
--	 */
--	mutex_lock(&c->alloc_sem);
--	pg = grab_cache_page_write_begin(mapping, index, flags);
--	if (!pg) {
--		ret = -ENOMEM;
--		goto release_sem;
--	}
--	*pagep = pg;
--
--	/*
 -	 * Read in the page if it wasn't already present. Cannot optimize away
 -	 * the whole page write case until jffs2_write_end can handle the
 -	 * case of a short-copy.
@@ -2550,20 +2543,19 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -		mutex_lock(&f->sem);
 -		ret = jffs2_do_readpage_nolock(inode, pg);
 -		mutex_unlock(&f->sem);
--		if (ret) {
--			unlock_page(pg);
--			put_page(pg);
--			goto release_sem;
--		}
+-		if (ret)
+-			goto out_page;
 -	}
 -	jffs2_dbg(1, "end write_begin(). pg->flags %lx\n", pg->flags);
--
--release_sem:
--	mutex_unlock(&c->alloc_sem);
--out_err:
 -	return ret;
--}
 -
+-out_page:
+-	unlock_page(pg);
+-	put_page(pg);
+-	return ret;
++	/* Do nothing */
+ }
+ 
 -static int jffs2_write_end(struct file *filp, struct address_space *mapping,
 -			loff_t pos, unsigned len, unsigned copied,
 -			struct page *pg, void *fsdata)
@@ -2661,8 +2653,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
 -	unlock_page(pg);
 -	put_page(pg);
 -	return writtenlen > 0 ? writtenlen : ret;
-+	/* Do nothing */
- }
+-}
 diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 --- old/fs/jffs2/fs.c	2022-05-09 17:22:53.000000000 +0800
 +++ new/fs/jffs2/fs.c	2022-05-10 16:13:37.830000000 +0800

net/lwip-2.1/enhancement/src/api_shell.c

@@ -356,7 +356,7 @@ int print_netif(struct netif *netif, char *print_buf, unsigned int buf_len)
         buf_len -= (unsigned int)ret;
     }
 
-    ret = snprintf_s(tmp, buf_len, (buf_len - 1), " %s\n", 
+    ret = snprintf_s(tmp, buf_len, (buf_len - 1), " %s\n",
                      (netif->flags & NETIF_FLAG_LINK_UP) ? "Link UP" : "Link Down");
     if ((ret <= 0) || ((unsigned int)ret >= buf_len))
         goto out;

testsuites/kernel/sample/kernel_extend/cpup/smoke/It_extend_cpup_001.c

@@ -39,7 +39,8 @@ extern "C" {
 
 static UINT32 TaskF02(VOID)
 {
-    UINT32 ret = OS_ERROR, cpupUse;
+    UINT32 ret = OS_ERROR;
+    UINT32 cpupUse;
     g_cpupTestCount++;
 
     // 2, Here, assert that g_cpupTestCount is equal to the expected value.