On Wed, 3 Jul 2013 16:12:26 -0400
"J. Bruce Fields" <bfields@xxxxxxxxxx> wrote:
> From: "J. Bruce Fields" <bfields@xxxxxxxxxx>
>
> Reserve I_MUTEX_PARENT and I_MUTEX_CHILD for locking of actual
> directories.
>
> (Also I_MUTEX_QUOTA isn't really a meaningful name for this locking
> class any more; fixed in a later patch.)
>
> Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>
> ---
> fs/inode.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/inode.c b/fs/inode.c
> index b8afbc7..942451b 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -987,11 +987,11 @@ EXPORT_SYMBOL(unlock_new_inode);
> void lock_two_nondirectories(struct inode *inode1, struct inode *inode2)
> {
> if (inode1 < inode2) {
> - mutex_lock_nested(&inode1->i_mutex, I_MUTEX_PARENT);
> - mutex_lock_nested(&inode2->i_mutex, I_MUTEX_CHILD);
> + mutex_lock(&inode1->i_mutex);
> + mutex_lock_nested(&inode2->i_mutex, I_MUTEX_QUOTA);
> } else {
> - mutex_lock_nested(&inode2->i_mutex, I_MUTEX_PARENT);
> - mutex_lock_nested(&inode1->i_mutex, I_MUTEX_CHILD);
> + mutex_lock(&inode2->i_mutex);
> + mutex_lock_nested(&inode1->i_mutex, I_MUTEX_QUOTA);
> }
> }
> EXPORT_SYMBOL(lock_two_nondirectories);
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
