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

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

Merge tag 'jfs-for-4.20' of git://github.com/kleikamp/linux-shaggy 

Pull jfs updates from David Kleikamp:
 "Just a few small fixes"

* tag 'jfs-for-4.20' of git://github.com/kleikamp/linux-shaggy:
  jfs: remove redundant dquot_initialize() in jfs_evict_inode()
  jfs: remove quota option from ignore list
  jfs: cache NULL when both default_acl and acl are NULL
parents 318b067a 1390643d

fs/jfs/acl.c

+4 −0
Original line number Diff line number Diff line
@@ -146,12 +146,16 @@ int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir) 
	if (default_acl) {

		rc = __jfs_set_acl(tid, inode, ACL_TYPE_DEFAULT, default_acl);

		posix_acl_release(default_acl);

	} else {

		inode->i_default_acl = NULL;

	}



	if (acl) {

		if (!rc)

			rc = __jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);

		posix_acl_release(acl);

	} else {

		inode->i_acl = NULL;

	}



	JFS_IP(inode)->mode2 = (JFS_IP(inode)->mode2 & 0xffff0000) |

fs/jfs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ void jfs_evict_inode(struct inode *inode) 
			/*

			 * Free the inode from the quota allocation.

			 */

			dquot_initialize(inode);

			dquot_free_inode(inode);

		}

	} else {

fs/jfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static const match_table_t tokens = { 
	{Opt_resize_nosize, "resize"},

	{Opt_errors, "errors=%s"},

	{Opt_ignore, "noquota"},

	{Opt_ignore, "quota"},

	{Opt_quota, "quota"},

	{Opt_usrquota, "usrquota"},

	{Opt_grpquota, "grpquota"},

	{Opt_uid, "uid=%u"},