openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "FROMLIST: fs: ext4: namei: trivial: Fix a couple of small whitespace issues" 

This reverts commit be904147a16f5d8182a49e889d7eb03f79cf746e.

FROMLIST patches are only merged into AOSP on the proviso that they
will eventually go upstream, however this FROMLIST patch was NACKed
upstream by Ted.

Bug: 191637574
Change-Id: I9814c993713df9f68111e250fdd3ef179f99ac22
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Lee Jones 2021-08-04 09:30:00 +01:00 committed by Lee Jones
parent d1c6df6dc8
commit 3c8369e63e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ext4/namei.c
View File

@ -1901,7 +1901,7 @@ static struct ext4_dir_entry_2 *dx_pack_dirents(struct inode *dir, char *base,
* Returns pointer to de in block into which the new entry will be inserted.
*/
static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
struct buffer_head **bh, struct dx_frame *frame,
struct buffer_head **bh,struct dx_frame *frame,
struct dx_hash_info *hinfo)
{
unsigned blocksize = dir->i_sb->s_blocksize;
@ -2248,7 +2248,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
if (retval)
goto out_frames;
de = do_split(handle, dir, &bh2, frame, &fname->hinfo);
de = do_split(handle,dir, &bh2, frame, &fname->hinfo);
if (IS_ERR(de)) {
retval = PTR_ERR(de);
goto out_frames;