diff options
Diffstat (limited to 'fs/ocfs2/ioctl.c')
| -rw-r--r-- | fs/ocfs2/ioctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c index 3663cef80689..4768be5f3086 100644 --- a/fs/ocfs2/ioctl.c +++ b/fs/ocfs2/ioctl.c | |||
| @@ -26,7 +26,7 @@ static int ocfs2_get_inode_attr(struct inode *inode, unsigned *flags) | |||
| 26 | { | 26 | { |
| 27 | int status; | 27 | int status; |
| 28 | 28 | ||
| 29 | status = ocfs2_meta_lock(inode, NULL, NULL, 0); | 29 | status = ocfs2_meta_lock(inode, NULL, 0); |
| 30 | if (status < 0) { | 30 | if (status < 0) { |
| 31 | mlog_errno(status); | 31 | mlog_errno(status); |
| 32 | return status; | 32 | return status; |
| @@ -43,14 +43,14 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags, | |||
| 43 | { | 43 | { |
| 44 | struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode); | 44 | struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode); |
| 45 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | 45 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); |
| 46 | struct ocfs2_journal_handle *handle = NULL; | 46 | handle_t *handle = NULL; |
| 47 | struct buffer_head *bh = NULL; | 47 | struct buffer_head *bh = NULL; |
| 48 | unsigned oldflags; | 48 | unsigned oldflags; |
| 49 | int status; | 49 | int status; |
| 50 | 50 | ||
| 51 | mutex_lock(&inode->i_mutex); | 51 | mutex_lock(&inode->i_mutex); |
| 52 | 52 | ||
| 53 | status = ocfs2_meta_lock(inode, NULL, &bh, 1); | 53 | status = ocfs2_meta_lock(inode, &bh, 1); |
| 54 | if (status < 0) { | 54 | if (status < 0) { |
| 55 | mlog_errno(status); | 55 | mlog_errno(status); |
| 56 | goto bail; | 56 | goto bail; |
| @@ -67,7 +67,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags, | |||
| 67 | if (!S_ISDIR(inode->i_mode)) | 67 | if (!S_ISDIR(inode->i_mode)) |
| 68 | flags &= ~OCFS2_DIRSYNC_FL; | 68 | flags &= ~OCFS2_DIRSYNC_FL; |
| 69 | 69 | ||
| 70 | handle = ocfs2_start_trans(osb, NULL, OCFS2_INODE_UPDATE_CREDITS); | 70 | handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); |
| 71 | if (IS_ERR(handle)) { | 71 | if (IS_ERR(handle)) { |
| 72 | status = PTR_ERR(handle); | 72 | status = PTR_ERR(handle); |
| 73 | mlog_errno(status); | 73 | mlog_errno(status); |
| @@ -96,7 +96,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags, | |||
| 96 | if (status < 0) | 96 | if (status < 0) |
| 97 | mlog_errno(status); | 97 | mlog_errno(status); |
| 98 | 98 | ||
| 99 | ocfs2_commit_trans(handle); | 99 | ocfs2_commit_trans(osb, handle); |
| 100 | bail_unlock: | 100 | bail_unlock: |
| 101 | ocfs2_meta_unlock(inode, 1); | 101 | ocfs2_meta_unlock(inode, 1); |
| 102 | bail: | 102 | bail: |
