file.c (a90714c150e3ce677c57a9dac3ab1ec342c75a95) | file.c (13723d00e374c2a6d6ccb5af6de965e89c3e1b01) |
---|---|
1/* -*- mode: c; c-basic-offset: 8; -*- 2 * vim: noexpandtab sw=8 ts=8 sts=0: 3 * 4 * file.c 5 * 6 * File open, close, extend, truncate 7 * 8 * Copyright (C) 2002, 2004 Oracle. All rights reserved. --- 242 unchanged lines hidden (view full) --- 251 252 handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); 253 if (IS_ERR(handle)) { 254 ret = PTR_ERR(handle); 255 mlog_errno(ret); 256 goto out; 257 } 258 | 1/* -*- mode: c; c-basic-offset: 8; -*- 2 * vim: noexpandtab sw=8 ts=8 sts=0: 3 * 4 * file.c 5 * 6 * File open, close, extend, truncate 7 * 8 * Copyright (C) 2002, 2004 Oracle. All rights reserved. --- 242 unchanged lines hidden (view full) --- 251 252 handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); 253 if (IS_ERR(handle)) { 254 ret = PTR_ERR(handle); 255 mlog_errno(ret); 256 goto out; 257 } 258 |
259 ret = ocfs2_journal_access(handle, inode, bh, 260 OCFS2_JOURNAL_ACCESS_WRITE); | 259 ret = ocfs2_journal_access_di(handle, inode, bh, 260 OCFS2_JOURNAL_ACCESS_WRITE); |
261 if (ret) { 262 mlog_errno(ret); 263 goto out_commit; 264 } 265 266 /* 267 * Don't use ocfs2_mark_inode_dirty() here as we don't always 268 * have i_mutex to guard against concurrent changes to other --- 79 unchanged lines hidden (view full) --- 348 349 handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); 350 if (IS_ERR(handle)) { 351 status = PTR_ERR(handle); 352 mlog_errno(status); 353 goto out; 354 } 355 | 261 if (ret) { 262 mlog_errno(ret); 263 goto out_commit; 264 } 265 266 /* 267 * Don't use ocfs2_mark_inode_dirty() here as we don't always 268 * have i_mutex to guard against concurrent changes to other --- 79 unchanged lines hidden (view full) --- 348 349 handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); 350 if (IS_ERR(handle)) { 351 status = PTR_ERR(handle); 352 mlog_errno(status); 353 goto out; 354 } 355 |
356 status = ocfs2_journal_access(handle, inode, fe_bh, 357 OCFS2_JOURNAL_ACCESS_WRITE); | 356 status = ocfs2_journal_access_di(handle, inode, fe_bh, 357 OCFS2_JOURNAL_ACCESS_WRITE); |
358 if (status < 0) { 359 mlog_errno(status); 360 goto out_commit; 361 } 362 363 /* 364 * Do this before setting i_size. 365 */ --- 219 unchanged lines hidden (view full) --- 585 status = -EDQUOT; 586 goto leave; 587 } 588 did_quota = 1; 589 590 /* reserve a write to the file entry early on - that we if we 591 * run out of credits in the allocation path, we can still 592 * update i_size. */ | 358 if (status < 0) { 359 mlog_errno(status); 360 goto out_commit; 361 } 362 363 /* 364 * Do this before setting i_size. 365 */ --- 219 unchanged lines hidden (view full) --- 585 status = -EDQUOT; 586 goto leave; 587 } 588 did_quota = 1; 589 590 /* reserve a write to the file entry early on - that we if we 591 * run out of credits in the allocation path, we can still 592 * update i_size. */ |
593 status = ocfs2_journal_access(handle, inode, bh, 594 OCFS2_JOURNAL_ACCESS_WRITE); | 593 status = ocfs2_journal_access_di(handle, inode, bh, 594 OCFS2_JOURNAL_ACCESS_WRITE); |
595 if (status < 0) { 596 mlog_errno(status); 597 goto leave; 598 } 599 600 prev_clusters = OCFS2_I(inode)->ip_clusters; 601 602 status = ocfs2_add_inode_data(osb, --- 513 unchanged lines hidden (view full) --- 1116 1117 handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); 1118 if (IS_ERR(handle)) { 1119 ret = PTR_ERR(handle); 1120 mlog_errno(ret); 1121 goto out; 1122 } 1123 | 595 if (status < 0) { 596 mlog_errno(status); 597 goto leave; 598 } 599 600 prev_clusters = OCFS2_I(inode)->ip_clusters; 601 602 status = ocfs2_add_inode_data(osb, --- 513 unchanged lines hidden (view full) --- 1116 1117 handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); 1118 if (IS_ERR(handle)) { 1119 ret = PTR_ERR(handle); 1120 mlog_errno(ret); 1121 goto out; 1122 } 1123 |
1124 ret = ocfs2_journal_access(handle, inode, bh, 1125 OCFS2_JOURNAL_ACCESS_WRITE); | 1124 ret = ocfs2_journal_access_di(handle, inode, bh, 1125 OCFS2_JOURNAL_ACCESS_WRITE); |
1126 if (ret < 0) { 1127 mlog_errno(ret); 1128 goto out_trans; 1129 } 1130 1131 inode->i_mode &= ~S_ISUID; 1132 if ((inode->i_mode & S_ISGID) && (inode->i_mode & S_IXGRP)) 1133 inode->i_mode &= ~S_ISGID; --- 1030 unchanged lines hidden --- | 1126 if (ret < 0) { 1127 mlog_errno(ret); 1128 goto out_trans; 1129 } 1130 1131 inode->i_mode &= ~S_ISUID; 1132 if ((inode->i_mode & S_ISGID) && (inode->i_mode & S_IXGRP)) 1133 inode->i_mode &= ~S_ISGID; --- 1030 unchanged lines hidden --- |