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

Commit 3e1c4005 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: add quota call to ocfs2_remove_btree_range()
  ocfs2: Wakeup the downconvert thread after a successful cancel convert
  ocfs2: Access the xattr bucket only before modifying it.
  configfs: Silence lockdep on mkdir(), rmdir() and configfs_depend_item()
  ocfs2: Fix possible deadlock in ocfs2_write_dquot()
  ocfs2: Push out dropping of dentry lock to ocfs2_wq
parents b987e8e5 fd4ef231

fs/configfs/dir.c

+59 −0
Original line number Diff line number Diff line
@@ -553,12 +553,24 @@ static void detach_groups(struct config_group *group) 


		child = sd->s_dentry;



		/*

		 * Note: we hide this from lockdep since we have no way

		 * to teach lockdep about recursive

		 * I_MUTEX_PARENT -> I_MUTEX_CHILD patterns along a path

		 * in an inode tree, which are valid as soon as

		 * I_MUTEX_PARENT -> I_MUTEX_CHILD is valid from a

		 * parent inode to one of its children.

		 */

		lockdep_off();

		mutex_lock(&child->d_inode->i_mutex);

		lockdep_on();



		configfs_detach_group(sd->s_element);

		child->d_inode->i_flags |= S_DEAD;



		lockdep_off();

		mutex_unlock(&child->d_inode->i_mutex);

		lockdep_on();



		d_delete(child);

		dput(child);
@@ -748,11 +760,22 @@ static int configfs_attach_item(struct config_item *parent_item, 
			 * We are going to remove an inode and its dentry but

			 * the VFS may already have hit and used them. Thus,

			 * we must lock them as rmdir() would.

			 *

			 * Note: we hide this from lockdep since we have no way

			 * to teach lockdep about recursive

			 * I_MUTEX_PARENT -> I_MUTEX_CHILD patterns along a path

			 * in an inode tree, which are valid as soon as

			 * I_MUTEX_PARENT -> I_MUTEX_CHILD is valid from a

			 * parent inode to one of its children.

			 */

			lockdep_off();

			mutex_lock(&dentry->d_inode->i_mutex);

			lockdep_on();

			configfs_remove_dir(item);

			dentry->d_inode->i_flags |= S_DEAD;

			lockdep_off();

			mutex_unlock(&dentry->d_inode->i_mutex);

			lockdep_on();

			d_delete(dentry);

		}

	}
@@ -787,14 +810,25 @@ static int configfs_attach_group(struct config_item *parent_item, 
		 *

		 * We must also lock the inode to remove it safely in case of

		 * error, as rmdir() would.

		 *

		 * Note: we hide this from lockdep since we have no way

		 * to teach lockdep about recursive

		 * I_MUTEX_PARENT -> I_MUTEX_CHILD patterns along a path

		 * in an inode tree, which are valid as soon as

		 * I_MUTEX_PARENT -> I_MUTEX_CHILD is valid from a

		 * parent inode to one of its children.

		 */

		lockdep_off();

		mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_CHILD);

		lockdep_on();

		ret = populate_groups(to_config_group(item));

		if (ret) {

			configfs_detach_item(item);

			dentry->d_inode->i_flags |= S_DEAD;

		}

		lockdep_off();

		mutex_unlock(&dentry->d_inode->i_mutex);

		lockdep_on();

		if (ret)

			d_delete(dentry);

	}
@@ -956,7 +990,17 @@ static int configfs_depend_prep(struct dentry *origin, 
	BUG_ON(!origin || !sd);



	/* Lock this guy on the way down */

	/*

	 * Note: we hide this from lockdep since we have no way

	 * to teach lockdep about recursive

	 * I_MUTEX_PARENT -> I_MUTEX_CHILD patterns along a path

	 * in an inode tree, which are valid as soon as

	 * I_MUTEX_PARENT -> I_MUTEX_CHILD is valid from a

	 * parent inode to one of its children.

	 */

	lockdep_off();

	mutex_lock(&sd->s_dentry->d_inode->i_mutex);

	lockdep_on();

	if (sd->s_element == target)  /* Boo-yah */

		goto out;
@@ -970,7 +1014,9 @@ static int configfs_depend_prep(struct dentry *origin, 
	}



	/* We looped all our children and didn't find target */

	lockdep_off();

	mutex_unlock(&sd->s_dentry->d_inode->i_mutex);

	lockdep_on();

	ret = -ENOENT;



out:
@@ -990,11 +1036,16 @@ static void configfs_depend_rollback(struct dentry *origin, 
	struct dentry *dentry = item->ci_dentry;



	while (dentry != origin) {

		/* See comments in configfs_depend_prep() */

		lockdep_off();

		mutex_unlock(&dentry->d_inode->i_mutex);

		lockdep_on();

		dentry = dentry->d_parent;

	}



	lockdep_off();

	mutex_unlock(&origin->d_inode->i_mutex);

	lockdep_on();

}



int configfs_depend_item(struct configfs_subsystem *subsys,
@@ -1329,8 +1380,16 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry) 
			}



			/* Wait until the racing operation terminates */

			/*

			 * Note: we hide this from lockdep since we are locked

			 * with subclass I_MUTEX_NORMAL from vfs_rmdir() (why

			 * not I_MUTEX_CHILD?), and I_MUTEX_XATTR or

			 * I_MUTEX_QUOTA are not relevant for the locked inode.

			 */

			lockdep_off();

			mutex_lock(wait_mutex);

			mutex_unlock(wait_mutex);

			lockdep_on();

		}

	} while (ret == -EAGAIN);

fs/ocfs2/alloc.c

+3 −0
Original line number Diff line number Diff line
@@ -5390,6 +5390,9 @@ int ocfs2_remove_btree_range(struct inode *inode, 
		goto out;

	}



	vfs_dq_free_space_nodirty(inode,

				  ocfs2_clusters_to_bytes(inode->i_sb, len));



	ret = ocfs2_remove_extent(inode, et, cpos, len, handle, meta_ac,

				  dealloc);

	if (ret) {

fs/ocfs2/dcache.c

+39 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "dlmglue.h"

#include "file.h"

#include "inode.h"

#include "super.h"





static int ocfs2_dentry_revalidate(struct dentry *dentry,
@@ -294,6 +295,34 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry, 
	return ret;

}



static DEFINE_SPINLOCK(dentry_list_lock);



/* We limit the number of dentry locks to drop in one go. We have

 * this limit so that we don't starve other users of ocfs2_wq. */

#define DL_INODE_DROP_COUNT 64



/* Drop inode references from dentry locks */

void ocfs2_drop_dl_inodes(struct work_struct *work)

{

	struct ocfs2_super *osb = container_of(work, struct ocfs2_super,

					       dentry_lock_work);

	struct ocfs2_dentry_lock *dl;

	int drop_count = DL_INODE_DROP_COUNT;



	spin_lock(&dentry_list_lock);

	while (osb->dentry_lock_list && drop_count--) {

		dl = osb->dentry_lock_list;

		osb->dentry_lock_list = dl->dl_next;

		spin_unlock(&dentry_list_lock);

		iput(dl->dl_inode);

		kfree(dl);

		spin_lock(&dentry_list_lock);

	}

	if (osb->dentry_lock_list)

		queue_work(ocfs2_wq, &osb->dentry_lock_work);

	spin_unlock(&dentry_list_lock);

}



/*

 * ocfs2_dentry_iput() and friends.

 *
@@ -318,16 +347,23 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry, 
static void ocfs2_drop_dentry_lock(struct ocfs2_super *osb,

				   struct ocfs2_dentry_lock *dl)

{

	iput(dl->dl_inode);

	ocfs2_simple_drop_lockres(osb, &dl->dl_lockres);

	ocfs2_lock_res_free(&dl->dl_lockres);

	kfree(dl);



	/* We leave dropping of inode reference to ocfs2_wq as that can

	 * possibly lead to inode deletion which gets tricky */

	spin_lock(&dentry_list_lock);

	if (!osb->dentry_lock_list)

		queue_work(ocfs2_wq, &osb->dentry_lock_work);

	dl->dl_next = osb->dentry_lock_list;

	osb->dentry_lock_list = dl;

	spin_unlock(&dentry_list_lock);

}



void ocfs2_dentry_lock_put(struct ocfs2_super *osb,

			   struct ocfs2_dentry_lock *dl)

{

	int unlock = 0;

	int unlock;



	BUG_ON(dl->dl_count == 0);

fs/ocfs2/dcache.h

+8 −1
Original line number Diff line number Diff line
@@ -29,8 +29,13 @@ 
extern struct dentry_operations ocfs2_dentry_ops;



struct ocfs2_dentry_lock {

	/* Use count of dentry lock */

	unsigned int		dl_count;

	union {

		/* Linked list of dentry locks to release */

		struct ocfs2_dentry_lock *dl_next;

		u64			dl_parent_blkno;

	};



	/*

	 * The ocfs2_dentry_lock keeps an inode reference until
@@ -47,6 +52,8 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry, struct inode *inode, 
void ocfs2_dentry_lock_put(struct ocfs2_super *osb,

			   struct ocfs2_dentry_lock *dl);



void ocfs2_drop_dl_inodes(struct work_struct *work);



struct dentry *ocfs2_find_local_alias(struct inode *inode, u64 parent_blkno,

				      int skip_unhashed);

fs/ocfs2/dlmglue.c

+4 −0
Original line number Diff line number Diff line
@@ -2860,6 +2860,10 @@ static void ocfs2_unlock_ast(void *opaque, int error) 
	case OCFS2_UNLOCK_CANCEL_CONVERT:

		mlog(0, "Cancel convert success for %s\n", lockres->l_name);

		lockres->l_action = OCFS2_AST_INVALID;

		/* Downconvert thread may have requeued this lock, we

		 * need to wake it. */

		if (lockres->l_flags & OCFS2_LOCK_BLOCKED)

			ocfs2_wake_downconvert_thread(ocfs2_get_lockres_osb(lockres));

		break;

	case OCFS2_UNLOCK_DROP_LOCK:

		lockres->l_level = DLM_LOCK_IV;