diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/ocfs2/dlmglue.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index de887063dcfc..8801e41afe80 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
| @@ -2052,7 +2052,7 @@ static int ocfs2_dlm_debug_open(struct inode *inode, struct file *file) | |||
| 2052 | mlog_errno(ret); | 2052 | mlog_errno(ret); |
| 2053 | goto out; | 2053 | goto out; |
| 2054 | } | 2054 | } |
| 2055 | osb = (struct ocfs2_super *) inode->u.generic_ip; | 2055 | osb = inode->i_private; |
| 2056 | ocfs2_get_dlm_debug(osb->osb_dlm_debug); | 2056 | ocfs2_get_dlm_debug(osb->osb_dlm_debug); |
| 2057 | priv->p_dlm_debug = osb->osb_dlm_debug; | 2057 | priv->p_dlm_debug = osb->osb_dlm_debug; |
| 2058 | INIT_LIST_HEAD(&priv->p_iter_res.l_debug_list); | 2058 | INIT_LIST_HEAD(&priv->p_iter_res.l_debug_list); |