diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 12:17:49 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 12:17:49 +1000 |
| commit | a2e8eaaef6a5e42e77c49b7e7fe4387e0e60dbf3 (patch) | |
| tree | b47343a092ccd13c5f56f7b284dcf61dccf74bcc /fs/ocfs2/dlmglue.c | |
| parent | e0c8f3ac835ba1cc2726dd551dd1fe56b776524d (diff) | |
| parent | f4d01439515acd5d9a09de1d1e02ca40403dda49 (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 39eb16ac5f98..5e02a893f46e 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -2966,7 +2966,7 @@ static const struct seq_operations ocfs2_dlm_seq_ops = { static int ocfs2_dlm_debug_release(struct inode *inode, struct file *file) { - struct seq_file *seq = (struct seq_file *) file->private_data; + struct seq_file *seq = file->private_data; struct ocfs2_dlm_seq_priv *priv = seq->private; struct ocfs2_lock_res *res = &priv->p_iter_res; @@ -3000,7 +3000,7 @@ static int ocfs2_dlm_debug_open(struct inode *inode, struct file *file) goto out; } - seq = (struct seq_file *) file->private_data; + seq = file->private_data; seq->private = priv; ocfs2_add_lockres_tracking(&priv->p_iter_res, |