Commit 29c079ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fs_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull misc filesystem updates from Jan Kara:
 "A couple of small bugfixes and cleanups for quota, udf, ext2, and
  reiserfs"

* tag 'fs_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: check time limit when back out space/inode change
  fs/quota: erase unused but set variable warning
  quota: fix wrong indentation
  udf: fix an uninitialized read bug and remove dead code
  fs/reiserfs/journal.c: Make remove_journal_hash static
  quota: remove trailing whitespaces
  quota: code cleanup for __dquot_alloc_space()
  ext2: Adjust the comment of function ext2_alloc_branch
  udf: Explain handling of load_nls() failure
parents a13f0655 632a9f3a

fs/ext2/inode.c

+3 −1
Original line number Diff line number Diff line
@@ -451,7 +451,9 @@ failed_out: 
/**

 *	ext2_alloc_branch - allocate and set up a chain of blocks.

 *	@inode: owner

 *	@num: depth of the chain (number of blocks to allocate)

 *	@indirect_blks: depth of the chain (number of blocks to allocate)

 *	@blks: number of allocated direct blocks

 *	@goal: preferred place for allocation

 *	@offsets: offsets (in the blocks) to store the pointers to next.

 *	@branch: place to store the chain in.

 *

fs/quota/dquot.c

+20 −17
Original line number Diff line number Diff line
@@ -424,10 +424,11 @@ int dquot_acquire(struct dquot *dquot) 
	struct quota_info *dqopt = sb_dqopt(dquot->dq_sb);



	mutex_lock(&dquot->dq_lock);

	if (!test_bit(DQ_READ_B, &dquot->dq_flags))

	if (!test_bit(DQ_READ_B, &dquot->dq_flags)) {

		ret = dqopt->ops[dquot->dq_id.type]->read_dqblk(dquot);

		if (ret < 0)

			goto out_iolock;

	}

	/* Make sure flags update is visible after dquot has been filled */

	smp_mb__before_atomic();

	set_bit(DQ_READ_B, &dquot->dq_flags);
@@ -1049,7 +1050,9 @@ static void remove_dquot_ref(struct super_block *sb, int type, 
		struct list_head *tofree_head)

{

	struct inode *inode;

#ifdef CONFIG_QUOTA_DEBUG

	int reserved = 0;

#endif



	spin_lock(&sb->s_inode_list_lock);

	list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {
@@ -1061,8 +1064,10 @@ static void remove_dquot_ref(struct super_block *sb, int type, 
		 */

		spin_lock(&dq_data_lock);

		if (!IS_NOQUOTA(inode)) {

#ifdef CONFIG_QUOTA_DEBUG

			if (unlikely(inode_get_rsv_space(inode) > 0))

				reserved = 1;

#endif

			remove_inode_dquot_ref(inode, type, tofree_head);

		}

		spin_unlock(&dq_data_lock);
@@ -1663,7 +1668,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) 
	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {

		if (!dquots[cnt])

			continue;

		if (flags & DQUOT_SPACE_RESERVE) {

		if (reserve) {

			ret = dquot_add_space(dquots[cnt], 0, number, flags,

					      &warn[cnt]);

		} else {
@@ -1676,13 +1681,11 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) 
				if (!dquots[cnt])

					continue;

				spin_lock(&dquots[cnt]->dq_dqb_lock);

				if (flags & DQUOT_SPACE_RESERVE) {

					dquots[cnt]->dq_dqb.dqb_rsvspace -=

									number;

				} else {

					dquots[cnt]->dq_dqb.dqb_curspace -=

									number;

				}

				if (reserve)

					dquot_free_reserved_space(dquots[cnt],

								  number);

				else

					dquot_decr_space(dquots[cnt], number);

				spin_unlock(&dquots[cnt]->dq_dqb_lock);

			}

			spin_unlock(&inode->i_lock);
@@ -1733,7 +1736,7 @@ int dquot_alloc_inode(struct inode *inode) 
					continue;

				/* Back out changes we already did */

				spin_lock(&dquots[cnt]->dq_dqb_lock);

				dquots[cnt]->dq_dqb.dqb_curinodes--;

				dquot_decr_inodes(dquots[cnt], 1);

				spin_unlock(&dquots[cnt]->dq_dqb_lock);

			}

			goto warn_put_all;

fs/reiserfs/journal.c

+1 −1
Original line number Diff line number Diff line
@@ -1844,7 +1844,7 @@ static int flush_used_journal_lists(struct super_block *s, 
 * removes any nodes in table with name block and dev as bh.

 * only touchs the hnext and hprev pointers.

 */

void remove_journal_hash(struct super_block *sb,

static void remove_journal_hash(struct super_block *sb,

			 struct reiserfs_journal_cnode **table,

			 struct reiserfs_journal_list *jl,

			 unsigned long block, int remove_freed)

fs/udf/namei.c

+0 −15
Original line number Diff line number Diff line
@@ -304,21 +304,6 @@ static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry, 
	if (dentry->d_name.len > UDF_NAME_LEN)

		return ERR_PTR(-ENAMETOOLONG);



#ifdef UDF_RECOVERY

	/* temporary shorthand for specifying files by inode number */

	if (!strncmp(dentry->d_name.name, ".B=", 3)) {

		struct kernel_lb_addr lb = {

			.logicalBlockNum = 0,

			.partitionReferenceNum =

				simple_strtoul(dentry->d_name.name + 3,

						NULL, 0),

		};

		inode = udf_iget(dir->i_sb, lb);

		if (IS_ERR(inode))

			return inode;

	} else

#endif /* UDF_RECOVERY */



	fi = udf_find_entry(dir, &dentry->d_name, &fibh, &cfi);

	if (IS_ERR(fi))

		return ERR_CAST(fi);

fs/udf/super.c

+5 −0
Original line number Diff line number Diff line
@@ -566,6 +566,11 @@ static int udf_parse_options(char *options, struct udf_options *uopt, 
			if (!remount) {

				if (uopt->nls_map)

					unload_nls(uopt->nls_map);

				/*

				 * load_nls() failure is handled later in

				 * udf_fill_super() after all options are

				 * parsed.

				 */

				uopt->nls_map = load_nls(args[0].from);

				uopt->flags |= (1 << UDF_FLAG_NLS_MAP);

			}

fs/quota/quota_v1.c

+1 −1

File changed.

Contains only whitespace changes.

fs/quota/quota_v2.c

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE