diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-26 00:05:12 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-26 00:13:25 -0400 |
commit | 002354112f1e3cc7400ef48b853aefb90e801588 (patch) | |
tree | 42bc0b17b008fc65b359a06e6f991b5247e10705 /fs/overlayfs | |
parent | 887bddfa90c79957d61067cd54a10087be0c8b23 (diff) |
restore killability of old mutex_lock_killable(&inode->i_mutex) users
The ones that are taking it exclusive, that is...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/overlayfs')
-rw-r--r-- | fs/overlayfs/readdir.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c index da186ee4f846..9e79f6458dfb 100644 --- a/fs/overlayfs/readdir.c +++ b/fs/overlayfs/readdir.c | |||
@@ -218,9 +218,7 @@ static int ovl_check_whiteouts(struct dentry *dir, struct ovl_readdir_data *rdd) | |||
218 | cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE); | 218 | cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE); |
219 | old_cred = override_creds(override_cred); | 219 | old_cred = override_creds(override_cred); |
220 | 220 | ||
221 | inode_lock(dir->d_inode); | 221 | err = down_write_killable(&dir->d_inode->i_rwsem); |
222 | err = 0; | ||
223 | // XXX: err = mutex_lock_killable(&dir->d_inode->i_mutex); | ||
224 | if (!err) { | 222 | if (!err) { |
225 | while (rdd->first_maybe_whiteout) { | 223 | while (rdd->first_maybe_whiteout) { |
226 | p = rdd->first_maybe_whiteout; | 224 | p = rdd->first_maybe_whiteout; |