Commit 7a400bf2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs 

Pull UBIFS updates from Richard Weinberger:

 - Fix for a race xattr list and modification

 - Various minor fixes (spelling, return codes, ...)

* tag 'for-linus-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode
  ubifs: Fix spelling mistakes
  ubifs: Remove ui_mutex in ubifs_xattr_get and change_xattr
  ubifs: Fix races between xattr_{set|get} and listxattr operations
  ubifs: fix snprintf() checking
  ubifs: journal: Fix error return code in ubifs_jnl_write_inode()
parents e49d68ce a801fcfe

drivers/mtd/ubi/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi) 


	n = snprintf(d->dfs_dir_name, UBI_DFS_DIR_LEN + 1, UBI_DFS_DIR_NAME,

		     ubi->ubi_num);

	if (n == UBI_DFS_DIR_LEN) {

	if (n > UBI_DFS_DIR_LEN) {

		/* The array size is too small */

		return -EINVAL;

	}

fs/ubifs/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -2824,7 +2824,7 @@ void dbg_debugfs_init_fs(struct ubifs_info *c) 


	n = snprintf(d->dfs_dir_name, UBIFS_DFS_DIR_LEN + 1, UBIFS_DFS_DIR_NAME,

		     c->vi.ubi_num, c->vi.vol_id);

	if (n == UBIFS_DFS_DIR_LEN) {

	if (n > UBIFS_DFS_DIR_LEN) {

		/* The array size is too small */

		return;

	}

fs/ubifs/dir.c

+7 −0
Original line number Diff line number Diff line
@@ -1337,7 +1337,10 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, 
			goto out_release;

		}



		spin_lock(&whiteout->i_lock);

		whiteout->i_state |= I_LINKABLE;

		spin_unlock(&whiteout->i_lock);



		whiteout_ui = ubifs_inode(whiteout);

		whiteout_ui->data = dev;

		whiteout_ui->data_len = ubifs_encode_dev(dev, MKDEV(0, 0));
@@ -1430,7 +1433,11 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, 


		inc_nlink(whiteout);

		mark_inode_dirty(whiteout);



		spin_lock(&whiteout->i_lock);

		whiteout->i_state &= ~I_LINKABLE;

		spin_unlock(&whiteout->i_lock);



		iput(whiteout);

	}

fs/ubifs/journal.c

+2 −1
Original line number Diff line number Diff line
@@ -882,6 +882,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode) 
		struct ubifs_dent_node *xent, *pxent = NULL;



		if (ui->xattr_cnt > ubifs_xattr_max_cnt(c)) {

			err = -EPERM;

			ubifs_err(c, "Cannot delete inode, it has too much xattrs!");

			goto out_release;

		}
@@ -1431,7 +1432,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, 
/**

 * truncate_data_node - re-compress/encrypt a truncated data node.

 * @c: UBIFS file-system description object

 * @inode: inode which referes to the data node

 * @inode: inode which refers to the data node

 * @block: data block number

 * @dn: data node to re-compress

 * @new_len: new length

fs/ubifs/replay.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static int apply_replay_entry(struct ubifs_info *c, struct replay_entry *r) 
 * @b: second replay entry

 *

 * This is a comparios function for 'list_sort()' which compares 2 replay

 * entries @a and @b by comparing their sequence numer.  Returns %1 if @a has

 * entries @a and @b by comparing their sequence number.  Returns %1 if @a has

 * greater sequence number and %-1 otherwise.

 */

static int replay_entries_cmp(void *priv, const struct list_head *a,