mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 21:21:47 +00:00
07eaac9438
This patch change mutex_lock to a new subclass and add a new inode lock subclass for the target inode which caused this lockdep warning. ============================================= [ INFO: possible recursive locking detected ] 2.6.35+ #5 --------------------------------------------- reflink/11086 is trying to acquire lock: (Meta){+++++.}, at: [<ffffffffa06f9d65>] ocfs2_reflink_ioctl+0x898/0x1229 [ocfs2] but task is already holding lock: (Meta){+++++.}, at: [<ffffffffa06f9aa0>] ocfs2_reflink_ioctl+0x5d3/0x1229 [ocfs2] other info that might help us debug this: 6 locks held by reflink/11086: #0: (&sb->s_type->i_mutex_key#15/1){+.+.+.}, at: [<ffffffff820e09ec>] lookup_create+0x26/0x97 #1: (&sb->s_type->i_mutex_key#15){+.+.+.}, at: [<ffffffffa06f99a0>] ocfs2_reflink_ioctl+0x4d3/0x1229 [ocfs2] #2: (Meta){+++++.}, at: [<ffffffffa06f9aa0>] ocfs2_reflink_ioctl+0x5d3/0x1229 [ocfs2] #3: (&oi->ip_xattr_sem){+.+.+.}, at: [<ffffffffa06f9b58>] ocfs2_reflink_ioctl+0x68b/0x1229 [ocfs2] #4: (&oi->ip_alloc_sem){+.+.+.}, at: [<ffffffffa06f9b67>] ocfs2_reflink_ioctl+0x69a/0x1229 [ocfs2] #5: (&sb->s_type->i_mutex_key#15/2){+.+...}, at: [<ffffffffa06f9d4f>] ocfs2_reflink_ioctl+0x882/0x1229 [ocfs2] stack backtrace: Pid: 11086, comm: reflink Not tainted 2.6.35+ #5 Call Trace: [<ffffffff82063dd9>] validate_chain+0x56e/0xd68 [<ffffffff82062275>] ? mark_held_locks+0x49/0x69 [<ffffffff82064d6d>] __lock_acquire+0x79a/0x7f1 [<ffffffff82065a81>] lock_acquire+0xc6/0xed [<ffffffffa06f9d65>] ? ocfs2_reflink_ioctl+0x898/0x1229 [ocfs2] [<ffffffffa06c9ade>] __ocfs2_cluster_lock+0x975/0xa0d [ocfs2] [<ffffffffa06f9d65>] ? ocfs2_reflink_ioctl+0x898/0x1229 [ocfs2] [<ffffffffa06e107b>] ? ocfs2_wait_for_recovery+0x15/0x8a [ocfs2] [<ffffffffa06cb6ea>] ocfs2_inode_lock_full_nested+0x1ac/0xdc5 [ocfs2] [<ffffffffa06f9d65>] ? ocfs2_reflink_ioctl+0x898/0x1229 [ocfs2] [<ffffffff820623a0>] ? trace_hardirqs_on_caller+0x10b/0x12f [<ffffffff82060193>] ? debug_mutex_free_waiter+0x4f/0x53 [<ffffffffa06f9d65>] ocfs2_reflink_ioctl+0x898/0x1229 [ocfs2] [<ffffffffa06ce24a>] ? ocfs2_file_lock_res_init+0x66/0x78 [ocfs2] [<ffffffff820bb2d2>] ? might_fault+0x40/0x8d [<ffffffffa06df9f6>] ocfs2_ioctl+0x61a/0x656 [ocfs2] [<ffffffff820ee5d3>] ? mntput_no_expire+0x1d/0xb0 [<ffffffff820e07b3>] ? path_put+0x2c/0x31 [<ffffffff820e53ac>] vfs_ioctl+0x2a/0x9d [<ffffffff820e5903>] do_vfs_ioctl+0x45d/0x4ae [<ffffffff8233a7f6>] ? _raw_spin_unlock+0x26/0x2a [<ffffffff8200299c>] ? sysret_check+0x27/0x62 [<ffffffff820e59ab>] sys_ioctl+0x57/0x7a [<ffffffff8200296b>] system_call_fastpath+0x16/0x1b Signed-off-by: Tao Ma <tao.ma@oracle.com> Signed-off-by: Joel Becker <joel.becker@oracle.com>
173 lines
5.8 KiB
C
173 lines
5.8 KiB
C
/* -*- mode: c; c-basic-offset: 8; -*-
|
|
* vim: noexpandtab sw=8 ts=8 sts=0:
|
|
*
|
|
* dlmglue.h
|
|
*
|
|
* description here
|
|
*
|
|
* Copyright (C) 2002, 2004 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 as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* 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.
|
|
*
|
|
* You should have received a copy of the GNU General Public
|
|
* License along with this program; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 021110-1307, USA.
|
|
*/
|
|
|
|
|
|
#ifndef DLMGLUE_H
|
|
#define DLMGLUE_H
|
|
|
|
#include "dcache.h"
|
|
|
|
#define OCFS2_LVB_VERSION 5
|
|
|
|
struct ocfs2_meta_lvb {
|
|
__u8 lvb_version;
|
|
__u8 lvb_reserved0;
|
|
__be16 lvb_idynfeatures;
|
|
__be32 lvb_iclusters;
|
|
__be32 lvb_iuid;
|
|
__be32 lvb_igid;
|
|
__be64 lvb_iatime_packed;
|
|
__be64 lvb_ictime_packed;
|
|
__be64 lvb_imtime_packed;
|
|
__be64 lvb_isize;
|
|
__be16 lvb_imode;
|
|
__be16 lvb_inlink;
|
|
__be32 lvb_iattr;
|
|
__be32 lvb_igeneration;
|
|
__be32 lvb_reserved2;
|
|
};
|
|
|
|
#define OCFS2_QINFO_LVB_VERSION 1
|
|
|
|
struct ocfs2_qinfo_lvb {
|
|
__u8 lvb_version;
|
|
__u8 lvb_reserved[3];
|
|
__be32 lvb_bgrace;
|
|
__be32 lvb_igrace;
|
|
__be32 lvb_syncms;
|
|
__be32 lvb_blocks;
|
|
__be32 lvb_free_blk;
|
|
__be32 lvb_free_entry;
|
|
};
|
|
|
|
#define OCFS2_ORPHAN_LVB_VERSION 1
|
|
|
|
struct ocfs2_orphan_scan_lvb {
|
|
__u8 lvb_version;
|
|
__u8 lvb_reserved[3];
|
|
__be32 lvb_os_seqno;
|
|
};
|
|
|
|
/* ocfs2_inode_lock_full() 'arg_flags' flags */
|
|
/* don't wait on recovery. */
|
|
#define OCFS2_META_LOCK_RECOVERY (0x01)
|
|
/* Instruct the dlm not to queue ourselves on the other node. */
|
|
#define OCFS2_META_LOCK_NOQUEUE (0x02)
|
|
/* don't block waiting for the downconvert thread, instead return -EAGAIN */
|
|
#define OCFS2_LOCK_NONBLOCK (0x04)
|
|
|
|
/* Locking subclasses of inode cluster lock */
|
|
enum {
|
|
OI_LS_NORMAL = 0,
|
|
OI_LS_PARENT,
|
|
OI_LS_RENAME1,
|
|
OI_LS_RENAME2,
|
|
OI_LS_REFLINK_TARGET,
|
|
};
|
|
|
|
int ocfs2_dlm_init(struct ocfs2_super *osb);
|
|
void ocfs2_dlm_shutdown(struct ocfs2_super *osb, int hangup_pending);
|
|
void ocfs2_lock_res_init_once(struct ocfs2_lock_res *res);
|
|
void ocfs2_inode_lock_res_init(struct ocfs2_lock_res *res,
|
|
enum ocfs2_lock_type type,
|
|
unsigned int generation,
|
|
struct inode *inode);
|
|
void ocfs2_dentry_lock_res_init(struct ocfs2_dentry_lock *dl,
|
|
u64 parent, struct inode *inode);
|
|
struct ocfs2_file_private;
|
|
void ocfs2_file_lock_res_init(struct ocfs2_lock_res *lockres,
|
|
struct ocfs2_file_private *fp);
|
|
struct ocfs2_mem_dqinfo;
|
|
void ocfs2_qinfo_lock_res_init(struct ocfs2_lock_res *lockres,
|
|
struct ocfs2_mem_dqinfo *info);
|
|
void ocfs2_refcount_lock_res_init(struct ocfs2_lock_res *lockres,
|
|
struct ocfs2_super *osb, u64 ref_blkno,
|
|
unsigned int generation);
|
|
void ocfs2_lock_res_free(struct ocfs2_lock_res *res);
|
|
int ocfs2_create_new_inode_locks(struct inode *inode);
|
|
int ocfs2_drop_inode_locks(struct inode *inode);
|
|
int ocfs2_rw_lock(struct inode *inode, int write);
|
|
void ocfs2_rw_unlock(struct inode *inode, int write);
|
|
int ocfs2_open_lock(struct inode *inode);
|
|
int ocfs2_try_open_lock(struct inode *inode, int write);
|
|
void ocfs2_open_unlock(struct inode *inode);
|
|
int ocfs2_inode_lock_atime(struct inode *inode,
|
|
struct vfsmount *vfsmnt,
|
|
int *level);
|
|
int ocfs2_inode_lock_full_nested(struct inode *inode,
|
|
struct buffer_head **ret_bh,
|
|
int ex,
|
|
int arg_flags,
|
|
int subclass);
|
|
int ocfs2_inode_lock_with_page(struct inode *inode,
|
|
struct buffer_head **ret_bh,
|
|
int ex,
|
|
struct page *page);
|
|
/* Variants without special locking class or flags */
|
|
#define ocfs2_inode_lock_full(i, r, e, f)\
|
|
ocfs2_inode_lock_full_nested(i, r, e, f, OI_LS_NORMAL)
|
|
#define ocfs2_inode_lock_nested(i, b, e, s)\
|
|
ocfs2_inode_lock_full_nested(i, b, e, 0, s)
|
|
/* 99% of the time we don't want to supply any additional flags --
|
|
* those are for very specific cases only. */
|
|
#define ocfs2_inode_lock(i, b, e) ocfs2_inode_lock_full_nested(i, b, e, 0, OI_LS_NORMAL)
|
|
void ocfs2_inode_unlock(struct inode *inode,
|
|
int ex);
|
|
int ocfs2_super_lock(struct ocfs2_super *osb,
|
|
int ex);
|
|
void ocfs2_super_unlock(struct ocfs2_super *osb,
|
|
int ex);
|
|
int ocfs2_orphan_scan_lock(struct ocfs2_super *osb, u32 *seqno);
|
|
void ocfs2_orphan_scan_unlock(struct ocfs2_super *osb, u32 seqno);
|
|
|
|
int ocfs2_rename_lock(struct ocfs2_super *osb);
|
|
void ocfs2_rename_unlock(struct ocfs2_super *osb);
|
|
int ocfs2_nfs_sync_lock(struct ocfs2_super *osb, int ex);
|
|
void ocfs2_nfs_sync_unlock(struct ocfs2_super *osb, int ex);
|
|
int ocfs2_dentry_lock(struct dentry *dentry, int ex);
|
|
void ocfs2_dentry_unlock(struct dentry *dentry, int ex);
|
|
int ocfs2_file_lock(struct file *file, int ex, int trylock);
|
|
void ocfs2_file_unlock(struct file *file);
|
|
int ocfs2_qinfo_lock(struct ocfs2_mem_dqinfo *oinfo, int ex);
|
|
void ocfs2_qinfo_unlock(struct ocfs2_mem_dqinfo *oinfo, int ex);
|
|
struct ocfs2_refcount_tree;
|
|
int ocfs2_refcount_lock(struct ocfs2_refcount_tree *ref_tree, int ex);
|
|
void ocfs2_refcount_unlock(struct ocfs2_refcount_tree *ref_tree, int ex);
|
|
|
|
|
|
void ocfs2_mark_lockres_freeing(struct ocfs2_lock_res *lockres);
|
|
void ocfs2_simple_drop_lockres(struct ocfs2_super *osb,
|
|
struct ocfs2_lock_res *lockres);
|
|
|
|
/* for the downconvert thread */
|
|
void ocfs2_wake_downconvert_thread(struct ocfs2_super *osb);
|
|
|
|
struct ocfs2_dlm_debug *ocfs2_new_dlm_debug(void);
|
|
void ocfs2_put_dlm_debug(struct ocfs2_dlm_debug *dlm_debug);
|
|
|
|
/* To set the locking protocol on module initialization */
|
|
void ocfs2_set_locking_protocol(void);
|
|
#endif /* DLMGLUE_H */
|