Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4361570 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: fix minor stylistic issues 



Fix several minor stylistic issues:
* lines longer than 80 characters
* space before closing parenthesis ')'
* spaces in the indentations

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 1bbfc848

fs/ubifs/debug.c

+2 −1
Original line number Diff line number Diff line
@@ -2421,7 +2421,8 @@ int dbg_check_nondata_nodes_order(struct ubifs_info *c, struct list_head *head) 
		hashb = key_block(c, &sb->key);



		if (hasha > hashb) {

			ubifs_err("larger hash %u goes before %u", hasha, hashb);

			ubifs_err("larger hash %u goes before %u",

				  hasha, hashb);

			goto error_dump;

		}

	}

fs/ubifs/file.c

+9 −8
Original line number Diff line number Diff line
@@ -971,11 +971,11 @@ static int do_writepage(struct page *page, int len) 
 * the page locked, and it locks @ui_mutex. However, write-back does take inode

 * @i_mutex, which means other VFS operations may be run on this inode at the

 * same time. And the problematic one is truncation to smaller size, from where

 * we have to call 'truncate_setsize()', which first changes @inode->i_size, then

 * drops the truncated pages. And while dropping the pages, it takes the page

 * lock. This means that 'do_truncation()' cannot call 'truncate_setsize()' with

 * @ui_mutex locked, because it would deadlock with 'ubifs_writepage()'. This

 * means that @inode->i_size is changed while @ui_mutex is unlocked.

 * we have to call 'truncate_setsize()', which first changes @inode->i_size,

 * then drops the truncated pages. And while dropping the pages, it takes the

 * page lock. This means that 'do_truncation()' cannot call 'truncate_setsize()'

 * with @ui_mutex locked, because it would deadlock with 'ubifs_writepage()'.

 * This means that @inode->i_size is changed while @ui_mutex is unlocked.

 *

 * XXX(truncate): with the new truncate sequence this is not true anymore,

 * and the calls to truncate_setsize can be move around freely.  They should
@@ -1432,10 +1432,11 @@ static int ubifs_releasepage(struct page *page, gfp_t unused_gfp_flags) 
}



/*

 * mmap()d file has taken write protection fault and is being made

 * writable. UBIFS must ensure page is budgeted for.

 * mmap()d file has taken write protection fault and is being made writable.

 * UBIFS must ensure page is budgeted for.

 */

static int ubifs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)

static int ubifs_vm_page_mkwrite(struct vm_area_struct *vma,

				 struct vm_fault *vmf)

{

	struct page *page = vmf->page;

	struct inode *inode = vma->vm_file->f_path.dentry->d_inode;

fs/ubifs/orphan.c

+2 −1
Original line number Diff line number Diff line
@@ -673,7 +673,8 @@ static int kill_orphans(struct ubifs_info *c) 
		sleb = ubifs_scan(c, lnum, 0, c->sbuf, 1);

		if (IS_ERR(sleb)) {

			if (PTR_ERR(sleb) == -EUCLEAN)

				sleb = ubifs_recover_leb(c, lnum, 0, c->sbuf, 0);

				sleb = ubifs_recover_leb(c, lnum, 0,

							 c->sbuf, 0);

			if (IS_ERR(sleb)) {

				err = PTR_ERR(sleb);

				break;

fs/ubifs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ static int check_free_space(struct ubifs_info *c) 
{

	ubifs_assert(c->dark_wm > 0);

	if (c->lst.total_free + c->lst.total_dirty < c->dark_wm) {

		ubifs_err("insufficient free space to mount in read/write mode");

		ubifs_err("insufficient free space to mount in R/W mode");

		dbg_dump_budg(c);

		dbg_dump_lprops(c);

		return -ENOSPC;

fs/ubifs/ubifs.h

+3 −3
Original line number Diff line number Diff line
@@ -389,9 +389,9 @@ struct ubifs_gced_idx_leb { 
 * The @ui_size is a "shadow" variable for @inode->i_size and UBIFS uses

 * @ui_size instead of @inode->i_size. The reason for this is that UBIFS cannot

 * make sure @inode->i_size is always changed under @ui_mutex, because it

 * cannot call 'truncate_setsize()' with @ui_mutex locked, because it would deadlock

 * with 'ubifs_writepage()' (see file.c). All the other inode fields are

 * changed under @ui_mutex, so they do not need "shadow" fields. Note, one

 * cannot call 'truncate_setsize()' with @ui_mutex locked, because it would

 * deadlock with 'ubifs_writepage()' (see file.c). All the other inode fields

 * are changed under @ui_mutex, so they do not need "shadow" fields. Note, one

 * could consider to rework locking and base it on "shadow" fields.

 */

struct ubifs_inode {

fs/ubifs/lpt_commit.c

+1 −1

File changed.

Contains only whitespace changes.

fs/ubifs/tnc.c

+5 −5

File changed.

Contains only whitespace changes.

fs/ubifs/io.c

+2 −2

File changed.

Contains only whitespace changes.