diff options
author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-10-09 19:02:40 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-12-01 21:28:05 -0500 |
commit | 4bcec1847ac4f75c2ee6d091b495f34d8d822e6a (patch) | |
tree | faac00bd440eff91bd59a3cef88e74220082163a /fs/ocfs2/journal.c | |
parent | a301a27d715276a71827004549bcbb2b64776c11 (diff) |
ocfs2: remove unused handle argument from ocfs2_meta_lock_full()
Now that this is unused and all callers pass NULL, we can safely remove it.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/journal.c')
-rw-r--r-- | fs/ocfs2/journal.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index f070487a0551..61db8e7fffa5 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
@@ -424,8 +424,7 @@ int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty) | |||
424 | /* Skip recovery waits here - journal inode metadata never | 424 | /* Skip recovery waits here - journal inode metadata never |
425 | * changes in a live cluster so it can be considered an | 425 | * changes in a live cluster so it can be considered an |
426 | * exception to the rule. */ | 426 | * exception to the rule. */ |
427 | status = ocfs2_meta_lock_full(inode, NULL, &bh, 1, | 427 | status = ocfs2_meta_lock_full(inode, &bh, 1, OCFS2_META_LOCK_RECOVERY); |
428 | OCFS2_META_LOCK_RECOVERY); | ||
429 | if (status < 0) { | 428 | if (status < 0) { |
430 | if (status != -ERESTARTSYS) | 429 | if (status != -ERESTARTSYS) |
431 | mlog(ML_ERROR, "Could not get lock on journal!\n"); | 430 | mlog(ML_ERROR, "Could not get lock on journal!\n"); |
@@ -1022,8 +1021,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb, | |||
1022 | } | 1021 | } |
1023 | SET_INODE_JOURNAL(inode); | 1022 | SET_INODE_JOURNAL(inode); |
1024 | 1023 | ||
1025 | status = ocfs2_meta_lock_full(inode, NULL, &bh, 1, | 1024 | status = ocfs2_meta_lock_full(inode, &bh, 1, OCFS2_META_LOCK_RECOVERY); |
1026 | OCFS2_META_LOCK_RECOVERY); | ||
1027 | if (status < 0) { | 1025 | if (status < 0) { |
1028 | mlog(0, "status returned from ocfs2_meta_lock=%d\n", status); | 1026 | mlog(0, "status returned from ocfs2_meta_lock=%d\n", status); |
1029 | if (status != -ERESTARTSYS) | 1027 | if (status != -ERESTARTSYS) |
@@ -1212,7 +1210,7 @@ static int ocfs2_trylock_journal(struct ocfs2_super *osb, | |||
1212 | SET_INODE_JOURNAL(inode); | 1210 | SET_INODE_JOURNAL(inode); |
1213 | 1211 | ||
1214 | flags = OCFS2_META_LOCK_RECOVERY | OCFS2_META_LOCK_NOQUEUE; | 1212 | flags = OCFS2_META_LOCK_RECOVERY | OCFS2_META_LOCK_NOQUEUE; |
1215 | status = ocfs2_meta_lock_full(inode, NULL, NULL, 1, flags); | 1213 | status = ocfs2_meta_lock_full(inode, NULL, 1, flags); |
1216 | if (status < 0) { | 1214 | if (status < 0) { |
1217 | if (status != -EAGAIN) | 1215 | if (status != -EAGAIN) |
1218 | mlog_errno(status); | 1216 | mlog_errno(status); |
@@ -1295,7 +1293,7 @@ static int ocfs2_queue_orphans(struct ocfs2_super *osb, | |||
1295 | } | 1293 | } |
1296 | 1294 | ||
1297 | mutex_lock(&orphan_dir_inode->i_mutex); | 1295 | mutex_lock(&orphan_dir_inode->i_mutex); |
1298 | status = ocfs2_meta_lock(orphan_dir_inode, NULL, NULL, 0); | 1296 | status = ocfs2_meta_lock(orphan_dir_inode, NULL, 0); |
1299 | if (status < 0) { | 1297 | if (status < 0) { |
1300 | mlog_errno(status); | 1298 | mlog_errno(status); |
1301 | goto out; | 1299 | goto out; |