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

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

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

Pull two misc vfs fixes from Jan Kara:
 "One small quota fix fixing spurious EDQUOT errors and one fanotify fix
  fixing a bug in the new fanotify FID reporting code"

* tag 'for_v5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fanotify: update connector fsid cache on add mark
  quota: fix a problem about transfer quota
parents 6331d118 c285a2f0

fs/notify/fanotify/fanotify.c

+4 −0
Original line number Diff line number Diff line
@@ -355,6 +355,10 @@ static __kernel_fsid_t fanotify_get_fsid(struct fsnotify_iter_info *iter_info) 
		/* Mark is just getting destroyed or created? */

		if (!conn)

			continue;

		if (!(conn->flags & FSNOTIFY_CONN_FLAG_HAS_FSID))

			continue;

		/* Pairs with smp_wmb() in fsnotify_add_mark_list() */

		smp_rmb();

		fsid = conn->fsid;

		if (WARN_ON_ONCE(!fsid.val[0] && !fsid.val[1]))

			continue;

fs/notify/mark.c

+11 −3
Original line number Diff line number Diff line
@@ -482,10 +482,13 @@ static int fsnotify_attach_connector_to_object(fsnotify_connp_t *connp, 
	conn->type = type;

	conn->obj = connp;

	/* Cache fsid of filesystem containing the object */

	if (fsid)

	if (fsid) {

		conn->fsid = *fsid;

	else

		conn->flags = FSNOTIFY_CONN_FLAG_HAS_FSID;

	} else {

		conn->fsid.val[0] = conn->fsid.val[1] = 0;

		conn->flags = 0;

	}

	if (conn->type == FSNOTIFY_OBJ_TYPE_INODE)

		inode = igrab(fsnotify_conn_inode(conn));

	/*
@@ -560,7 +563,12 @@ static int fsnotify_add_mark_list(struct fsnotify_mark *mark, 
		if (err)

			return err;

		goto restart;

	} else if (fsid && (conn->fsid.val[0] || conn->fsid.val[1]) &&

	} else if (fsid && !(conn->flags & FSNOTIFY_CONN_FLAG_HAS_FSID)) {

		conn->fsid = *fsid;

		/* Pairs with smp_rmb() in fanotify_get_fsid() */

		smp_wmb();

		conn->flags |= FSNOTIFY_CONN_FLAG_HAS_FSID;

	} else if (fsid && (conn->flags & FSNOTIFY_CONN_FLAG_HAS_FSID) &&

		   (fsid->val[0] != conn->fsid.val[0] ||

		    fsid->val[1] != conn->fsid.val[1])) {

		/*

fs/quota/dquot.c

+2 −2
Original line number Diff line number Diff line
@@ -1996,8 +1996,8 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to) 
				       &warn_to[cnt]);

		if (ret)

			goto over_quota;

		ret = dquot_add_space(transfer_to[cnt], cur_space, rsv_space, 0,

				      &warn_to[cnt]);

		ret = dquot_add_space(transfer_to[cnt], cur_space, rsv_space,

				      DQUOT_SPACE_WARN, &warn_to[cnt]);

		if (ret) {

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

			dquot_decr_inodes(transfer_to[cnt], inode_usage);

include/linux/fsnotify_backend.h

+3 −1
Original line number Diff line number Diff line
@@ -292,7 +292,9 @@ typedef struct fsnotify_mark_connector __rcu *fsnotify_connp_t; 
 */

struct fsnotify_mark_connector {

	spinlock_t lock;

	unsigned int type;	/* Type of object [lock] */

	unsigned short type;	/* Type of object [lock] */

#define FSNOTIFY_CONN_FLAG_HAS_FSID	0x01

	unsigned short flags;	/* flags [lock] */

	__kernel_fsid_t fsid;	/* fsid of filesystem containing object */

	union {

		/* Object pointer [lock] */