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

Commit e57f146b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubifs 

Pull UBIFS changes from Artem Bityutskiy:
 - Improve error messages
 - Clean-up i_nlink management
 - Minor clean-ups

* tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: improve error messages
  UBIFS: kill CUR_MAX_KEY_LEN macro
  UBIFS: do not use inc_link when i_nlink is zero
  UBIFS: make the dbg_lock spinlock static
  UBIFS: increase dumps loglevel
  UBIFS: amend recovery debugging message
parents 7e61b3ff 5a1f36c9

fs/ubifs/debug.c

+205 −205

File changed.

Preview size limit exceeded, changes collapsed.

fs/ubifs/debug.h

+0 −3
Original line number Diff line number Diff line
@@ -164,9 +164,7 @@ struct ubifs_global_debug_info { 
#define dbg_dump_stack() dump_stack()



#define dbg_err(fmt, ...) do {                                                 \

	spin_lock(&dbg_lock);                                                  \

	ubifs_err(fmt, ##__VA_ARGS__);                                         \

	spin_unlock(&dbg_lock);                                                \

} while (0)



#define ubifs_dbg_msg(type, fmt, ...) \
@@ -217,7 +215,6 @@ struct ubifs_global_debug_info { 
/* Additional recovery messages */

#define dbg_rcvry(fmt, ...) ubifs_dbg_msg("rcvry", fmt, ##__VA_ARGS__)



extern spinlock_t dbg_lock;

extern struct ubifs_global_debug_info ubifs_dbg;



static inline int dbg_is_chk_gen(const struct ubifs_info *c)

fs/ubifs/dir.c

+9 −9
Original line number Diff line number Diff line
@@ -566,6 +566,7 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry) 
	int sz_change = CALC_DENT_SIZE(dentry->d_name.len);

	int err, budgeted = 1;

	struct ubifs_budget_req req = { .mod_dent = 1, .dirtied_ino = 2 };

	unsigned int saved_nlink = inode->i_nlink;



	/*

	 * Budget request settings: deletion direntry, deletion inode (+1 for
@@ -613,7 +614,7 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry) 
out_cancel:

	dir->i_size += sz_change;

	dir_ui->ui_size = dir->i_size;

	inc_nlink(inode);

	set_nlink(inode, saved_nlink);

	unlock_2_inodes(dir, inode);

	if (budgeted)

		ubifs_release_budget(c, &req);
@@ -704,8 +705,7 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry) 
	dir->i_size += sz_change;

	dir_ui->ui_size = dir->i_size;

	inc_nlink(dir);

	inc_nlink(inode);

	inc_nlink(inode);

	set_nlink(inode, 2);

	unlock_2_inodes(dir, inode);

	if (budgeted)

		ubifs_release_budget(c, &req);
@@ -977,6 +977,7 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	struct ubifs_budget_req ino_req = { .dirtied_ino = 1,

			.dirtied_ino_d = ALIGN(old_inode_ui->data_len, 8) };

	struct timespec time;

	unsigned int saved_nlink;



	/*

	 * Budget request settings: deletion direntry, new direntry, removing
@@ -1059,13 +1060,14 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	if (unlink) {

		/*

		 * Directories cannot have hard-links, so if this is a

		 * directory, decrement its @i_nlink twice because an empty

		 * directory has @i_nlink 2.

		 * directory, just clear @i_nlink.

		 */

		saved_nlink = new_inode->i_nlink;

		if (is_dir)

			clear_nlink(new_inode);

		else

			drop_nlink(new_inode);

		new_inode->i_ctime = time;

		drop_nlink(new_inode);

	} else {

		new_dir->i_size += new_sz;

		ubifs_inode(new_dir)->ui_size = new_dir->i_size;
@@ -1102,9 +1104,7 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry, 


out_cancel:

	if (unlink) {

		if (is_dir)

			inc_nlink(new_inode);

		inc_nlink(new_inode);

		set_nlink(new_inode, saved_nlink);

	} else {

		new_dir->i_size -= new_sz;

		ubifs_inode(new_dir)->ui_size = new_dir->i_size;

fs/ubifs/recovery.c

+2 −1
Original line number Diff line number Diff line
@@ -679,7 +679,8 @@ struct ubifs_scan_leb *ubifs_recover_leb(struct ubifs_info *c, int lnum, 
			   ret == SCANNED_GARBAGE     ||

			   ret == SCANNED_A_BAD_PAD_NODE ||

			   ret == SCANNED_A_CORRUPT_NODE) {

			dbg_rcvry("found corruption - %d", ret);

			dbg_rcvry("found corruption (%d) at %d:%d",

				  ret, lnum, offs);

			break;

		} else {

			dbg_err("unexpected return value %d", ret);

fs/ubifs/sb.c

+14 −5
Original line number Diff line number Diff line
@@ -410,13 +410,23 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup) 
	}



	if (c->main_lebs < UBIFS_MIN_MAIN_LEBS) {

		err = 7;

		ubifs_err("too few main LEBs count %d, must be at least %d",

			  c->main_lebs, UBIFS_MIN_MAIN_LEBS);

		goto failed;

	}



	if (c->max_bud_bytes < (long long)c->leb_size * UBIFS_MIN_BUD_LEBS ||

	    c->max_bud_bytes > (long long)c->leb_size * c->main_lebs) {

		err = 8;

	max_bytes = (long long)c->leb_size * UBIFS_MIN_BUD_LEBS;

	if (c->max_bud_bytes < max_bytes) {

		ubifs_err("too small journal (%lld bytes), must be at least "

			  "%lld bytes",  c->max_bud_bytes, max_bytes);

		goto failed;

	}



	max_bytes = (long long)c->leb_size * c->main_lebs;

	if (c->max_bud_bytes > max_bytes) {

		ubifs_err("too large journal size (%lld bytes), only %lld bytes"

			  "available in the main area",

			  c->max_bud_bytes, max_bytes);

		goto failed;

	}
@@ -450,7 +460,6 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup) 
		goto failed;

	}



	max_bytes = c->main_lebs * (long long)c->leb_size;

	if (c->rp_size < 0 || max_bytes < c->rp_size) {

		err = 14;

		goto failed;