From 50e9c89c81ad60ad5a7ab887178cef50cef2afe3 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 22 Mar 2013 18:12:51 +0000 Subject: [PATCH] --- yaml --- r: 374839 b: refs/heads/master c: 5c50c9b89f1179237e0c0afb399432924058e756 h: refs/heads/master i: 374837: d41ccaf9b96a10e4ed1477b7232076f91dcd8a8f 374835: 029dff8e81f719b5a598c8abba7cadb751510770 374831: 8f999d9b0d6d0c71bd08cfcce2082471c70e63f1 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/ioctl.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 376f9af5d5dd..a1e06ad02262 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94ef7280e8b3a5b13ba3cc515e5c198c1181176e +refs/heads/master: 5c50c9b89f1179237e0c0afb399432924058e756 diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c index 2c02310ff2d9..9c44d657b795 100644 --- a/trunk/fs/btrfs/ioctl.c +++ b/trunk/fs/btrfs/ioctl.c @@ -723,7 +723,9 @@ static noinline int btrfs_mksubvol(struct path *parent, struct dentry *dentry; int error; - mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT); + error = mutex_lock_killable_nested(&dir->i_mutex, I_MUTEX_PARENT); + if (error == -EINTR) + return error; dentry = lookup_one_len(name, parent->dentry, namelen); error = PTR_ERR(dentry); @@ -2086,7 +2088,9 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, if (err) goto out; - mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT); + err = mutex_lock_killable_nested(&dir->i_mutex, I_MUTEX_PARENT); + if (err == -EINTR) + goto out; dentry = lookup_one_len(vol_args->name, parent, namelen); if (IS_ERR(dentry)) { err = PTR_ERR(dentry);