c25a1e0671
Commit702e5bc68a("ocfs2: use generic posix ACL infrastructure") refactored code to use posix_acl_create. The problem with this function is that it is not mindful of the cluster wide inode lock making it unsuitable for use with ocfs2 inode creation with ACLs. For example, when used in ocfs2_mknod, this function can cause deadlock as follows. The parent dir inode lock is taken when calling posix_acl_create -> get_acl -> ocfs2_iop_get_acl which takes the inode lock again. This can cause deadlock if there is a blocked remote lock request waiting for the lock to be downconverted. And same deadlock happened in ocfs2_reflink. This fix is to revert back using ocfs2_init_acl. Fixes:702e5bc68a("ocfs2: use generic posix ACL infrastructure") Signed-off-by: Tariq Saeed <tariq.x.saeed@oracle.com> Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com> Cc: Mark Fasheh <mfasheh@suse.de> Cc: Joel Becker <jlbec@evilplan.org> Cc: Joseph Qi <joseph.qi@huawei.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
44 lines
1.4 KiB
C
44 lines
1.4 KiB
C
/* -*- mode: c; c-basic-offset: 8; -*-
|
|
* vim: noexpandtab sw=8 ts=8 sts=0:
|
|
*
|
|
* acl.h
|
|
*
|
|
* Copyright (C) 2004, 2008 Oracle. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public
|
|
* License version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*/
|
|
|
|
#ifndef OCFS2_ACL_H
|
|
#define OCFS2_ACL_H
|
|
|
|
#include <linux/posix_acl_xattr.h>
|
|
|
|
struct ocfs2_acl_entry {
|
|
__le16 e_tag;
|
|
__le16 e_perm;
|
|
__le32 e_id;
|
|
};
|
|
|
|
struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type);
|
|
int ocfs2_iop_set_acl(struct inode *inode, struct posix_acl *acl, int type);
|
|
int ocfs2_set_acl(handle_t *handle,
|
|
struct inode *inode,
|
|
struct buffer_head *di_bh,
|
|
int type,
|
|
struct posix_acl *acl,
|
|
struct ocfs2_alloc_context *meta_ac,
|
|
struct ocfs2_alloc_context *data_ac);
|
|
extern int ocfs2_acl_chmod(struct inode *, struct buffer_head *);
|
|
extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *,
|
|
struct buffer_head *, struct buffer_head *,
|
|
struct ocfs2_alloc_context *,
|
|
struct ocfs2_alloc_context *);
|
|
|
|
#endif /* OCFS2_ACL_H */
|