Commit 09e70bb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull ext2, udf, reiserfs, quota cleanups and minor fixes from Jan Kara:
 "A few ext2 fixups and then several (mostly comment and documentation)
  cleanups in ext2, udf, reiserfs, and quota"

* tag 'for_v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  reiserfs: delete duplicated words
  udf: osta_udf.h: delete a duplicated word
  reiserfs: reiserfs.h: delete a duplicated word
  ext2: ext2.h: fix duplicated word + typos
  udf: Replace HTTP links with HTTPS ones
  quota: Fixup http links in quota doc
  Replace HTTP links with HTTPS ones: DISKQUOTA
  ext2: initialize quota info in ext2_xattr_set()
  ext2: fix some incorrect comments in inode.c
  ext2: remove nocheck option
  ext2: fix missing percpu_counter_inc
  ext2: ext2_find_entry() return -ENOENT if no entry found
  ext2: propagate errors up to ext2_find_entry()'s callers
  ext2: fix improper assignment for e_value_offs
parents 019c407c 9436fb4d

Documentation/filesystems/quota.rst

+6 −6
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Quota limits (and amount of grace time) are set independently for each 
filesystem.



For more details about quota design, see the documentation in quota-tools package

(http://sourceforge.net/projects/linuxquota).

(https://sourceforge.net/projects/linuxquota).



Quota netlink interface

=======================
@@ -31,11 +31,11 @@ the above events to userspace. There they can be captured by an application 
and processed accordingly.



The interface uses generic netlink framework (see

http://lwn.net/Articles/208755/ and http://people.suug.ch/~tgr/libnl/ for more

details about this layer). The name of the quota generic netlink interface

is "VFS_DQUOT". Definitions of constants below are in <linux/quota.h>.

Since the quota netlink protocol is not namespace aware, quota netlink messages

are sent only in initial network namespace.

https://lwn.net/Articles/208755/ and http://www.infradead.org/~tgr/libnl/ for

more details about this layer). The name of the quota generic netlink interface

is "VFS_DQUOT". Definitions of constants below are in <linux/quota.h>.  Since

the quota netlink protocol is not namespace aware, quota netlink messages are

sent only in initial network namespace.



Currently, the interface supports only one message type QUOTA_NL_C_WARNING.

This command is used to send a notification about any of the above mentioned

Documentation/filesystems/udf.rst

+1 −1
Original line number Diff line number Diff line
@@ -72,4 +72,4 @@ For the latest version and toolset see: 


Documentation on UDF and ECMA 167 is available FREE from:

	- http://www.osta.org/

	- http://www.ecma-international.org/
 
	- https://www.ecma-international.org/

fs/ext2/dir.c

+27 −28
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ struct ext2_dir_entry_2 *ext2_find_entry (struct inode *dir, 
	struct page *page = NULL;

	struct ext2_inode_info *ei = EXT2_I(dir);

	ext2_dirent * de;

	int dir_has_error = 0;



	if (npages == 0)

		goto out;
@@ -362,8 +361,10 @@ struct ext2_dir_entry_2 *ext2_find_entry (struct inode *dir, 
	n = start;

	do {

		char *kaddr;

		page = ext2_get_page(dir, n, dir_has_error);

		if (!IS_ERR(page)) {

		page = ext2_get_page(dir, n, 0);

		if (IS_ERR(page))

			return ERR_CAST(page);



		kaddr = page_address(page);

		de = (ext2_dirent *) kaddr;

		kaddr += ext2_last_byte(dir, n) - reclen;
@@ -379,8 +380,6 @@ struct ext2_dir_entry_2 *ext2_find_entry (struct inode *dir, 
			de = ext2_next_entry(de);

		}

		ext2_put_page(page);

		} else

			dir_has_error = 1;



		if (++n >= npages)

			n = 0;
@@ -394,7 +393,7 @@ struct ext2_dir_entry_2 *ext2_find_entry (struct inode *dir, 
		}

	} while (n != start);

out:

	return NULL;

	return ERR_PTR(-ENOENT);



found:

	*res_page = page;
@@ -414,18 +413,18 @@ struct ext2_dir_entry_2 * ext2_dotdot (struct inode *dir, struct page **p) 
	return de;

}



ino_t ext2_inode_by_name(struct inode *dir, const struct qstr *child)

int ext2_inode_by_name(struct inode *dir, const struct qstr *child, ino_t *ino)

{

	ino_t res = 0;

	struct ext2_dir_entry_2 *de;

	struct page *page;

	

	de = ext2_find_entry(dir, child, &page);

	if (de) {

		res = le32_to_cpu(de->inode);

	if (IS_ERR(de))

		return PTR_ERR(de);



	*ino = le32_to_cpu(de->inode);

	ext2_put_page(page);

	}

	return res;

	return 0;

}



static int ext2_prepare_chunk(struct page *page, loff_t pos, unsigned len)

fs/ext2/ext2.h

+4 −4
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ struct ext2_block_alloc_info { 
	/*

	 * Was i_next_alloc_goal in ext2_inode_info

	 * is the *physical* companion to i_next_alloc_block.

	 * it the the physical block number of the block which was most-recentl

	 * allocated to this file.  This give us the goal (target) for the next

	 * it is the physical block number of the block which was most-recently

	 * allocated to this file.  This gives us the goal (target) for the next

	 * allocation when we detect linearly ascending requests.

	 */

	ext2_fsblk_t		last_alloc_physical_block;
@@ -374,7 +374,6 @@ struct ext2_inode { 
/*

 * Mount flags

 */

#define EXT2_MOUNT_CHECK		0x000001  /* Do mount-time checks */

#define EXT2_MOUNT_OLDALLOC		0x000002  /* Don't use the new Orlov allocator */

#define EXT2_MOUNT_GRPID		0x000004  /* Create files with directory's group */

#define EXT2_MOUNT_DEBUG		0x000008  /* Some debugging messages */
@@ -738,7 +737,8 @@ extern void ext2_rsv_window_add(struct super_block *sb, struct ext2_reserve_wind 


/* dir.c */

extern int ext2_add_link (struct dentry *, struct inode *);

extern ino_t ext2_inode_by_name(struct inode *, const struct qstr *);

extern int ext2_inode_by_name(struct inode *dir,

			      const struct qstr *child, ino_t *ino);

extern int ext2_make_empty(struct inode *, struct inode *);

extern struct ext2_dir_entry_2 * ext2_find_entry (struct inode *,const struct qstr *, struct page **);

extern int ext2_delete_entry (struct ext2_dir_entry_2 *, struct page *);

fs/ext2/ialloc.c

+2 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static void ext2_release_inode(struct super_block *sb, int group, int dir) 
	if (dir)

		le16_add_cpu(&desc->bg_used_dirs_count, -1);

	spin_unlock(sb_bgl_lock(EXT2_SB(sb), group));

	percpu_counter_inc(&EXT2_SB(sb)->s_freeinodes_counter);

	if (dir)

		percpu_counter_dec(&EXT2_SB(sb)->s_dirs_counter);

	mark_buffer_dirty(bh);
@@ -528,7 +529,7 @@ got: 
		goto fail;

	}



	percpu_counter_add(&sbi->s_freeinodes_counter, -1);

	percpu_counter_dec(&sbi->s_freeinodes_counter);

	if (S_ISDIR(mode))

		percpu_counter_inc(&sbi->s_dirs_counter);

CRA Git | Maintained and supported by SUSTech CRA and CCSE