mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	bcachefs: Don't set btree_path to updtodate if we don't fill
This fixes various locking asserts, and a null ptr deref in bch2_btree_iter_peek_path(). Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
		
							parent
							
								
									cf67f46641
								
							
						
					
					
						commit
						bd5b09727f
					
				
					 1 changed files with 1 additions and 3 deletions
				
			
		| 
						 | 
					@ -291,10 +291,8 @@ static noinline int btree_key_cache_fill(struct btree_trans *trans,
 | 
				
			||||||
					 struct btree_path *ck_path,
 | 
										 struct btree_path *ck_path,
 | 
				
			||||||
					 unsigned flags)
 | 
										 unsigned flags)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (flags & BTREE_ITER_cached_nofill) {
 | 
						if (flags & BTREE_ITER_cached_nofill)
 | 
				
			||||||
		ck_path->uptodate = BTREE_ITER_UPTODATE;
 | 
					 | 
				
			||||||
		return 0;
 | 
							return 0;
 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	struct bch_fs *c = trans->c;
 | 
						struct bch_fs *c = trans->c;
 | 
				
			||||||
	struct btree_iter iter;
 | 
						struct btree_iter iter;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue