Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755586AbbGCOmX (ORCPT ); Fri, 3 Jul 2015 10:42:23 -0400 Received: from mga01.intel.com ([192.55.52.88]:58112 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932092AbbGCOk6 (ORCPT ); Fri, 3 Jul 2015 10:40:58 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,400,1432623600"; d="scan'208";a="757944110" From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Viro Cc: Matthew Wilcox , willy@linux.intel.com Subject: [PATCH v2 4/6] vfs: Allow truncate, chomd and chown to be interrupted by fatal signals Date: Fri, 3 Jul 2015 10:40:41 -0400 Message-Id: <1435934443-17090-5-git-send-email-matthew.r.wilcox@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435934443-17090-1-git-send-email-matthew.r.wilcox@intel.com> References: <1435934443-17090-1-git-send-email-matthew.r.wilcox@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1813 Lines: 52 If another task dies while holding the i_mutex, tasks trying to truncate, chmod or chown the file will hang. Allowing a fatal interrupt to kill the task is beneficial for the system administrator trying to get the machine to shut down more cleanly. Signed-off-by: Matthew Wilcox --- fs/open.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/open.c b/fs/open.c index e0250bd..4b0061e 100644 --- a/fs/open.c +++ b/fs/open.c @@ -56,7 +56,8 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, if (ret) newattrs.ia_valid |= ret | ATTR_FORCE; - mutex_lock(&dentry->d_inode->i_mutex); + if (mutex_lock_killable(&dentry->d_inode->i_mutex)) + return -EINTR; /* Note any delegations or leases have already been broken: */ ret = notify_change(dentry, &newattrs, NULL); mutex_unlock(&dentry->d_inode->i_mutex); @@ -508,7 +509,8 @@ static int chmod_common(struct path *path, umode_t mode) if (error) return error; retry_deleg: - mutex_lock(&inode->i_mutex); + if (mutex_lock_killable(&inode->i_mutex)) + return -EINTR; error = security_path_chmod(path, mode); if (error) goto out_unlock; @@ -591,7 +593,8 @@ retry_deleg: if (!S_ISDIR(inode->i_mode)) newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV; - mutex_lock(&inode->i_mutex); + if (mutex_lock_killable(&inode->i_mutex)) + return -EINTR; error = security_path_chown(path, uid, gid); if (!error) error = notify_change(path->dentry, &newattrs, &delegated_inode); -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/