aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/namei.c
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2006-10-09 19:02:40 -0400
committerMark Fasheh <mark.fasheh@oracle.com>2006-12-01 21:28:05 -0500
commit4bcec1847ac4f75c2ee6d091b495f34d8d822e6a (patch)
treefaac00bd440eff91bd59a3cef88e74220082163a /fs/ocfs2/namei.c
parenta301a27d715276a71827004549bcbb2b64776c11 (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/namei.c')
-rw-r--r--fs/ocfs2/namei.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 8d03ef446868..daf70605afa8 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -159,7 +159,7 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,
159 mlog(0, "find name %.*s in directory %llu\n", dentry->d_name.len, 159 mlog(0, "find name %.*s in directory %llu\n", dentry->d_name.len,
160 dentry->d_name.name, (unsigned long long)OCFS2_I(dir)->ip_blkno); 160 dentry->d_name.name, (unsigned long long)OCFS2_I(dir)->ip_blkno);
161 161
162 status = ocfs2_meta_lock(dir, NULL, NULL, 0); 162 status = ocfs2_meta_lock(dir, NULL, 0);
163 if (status < 0) { 163 if (status < 0) {
164 if (status != -ENOENT) 164 if (status != -ENOENT)
165 mlog_errno(status); 165 mlog_errno(status);
@@ -327,7 +327,7 @@ static int ocfs2_mknod(struct inode *dir,
327 /* get our super block */ 327 /* get our super block */
328 osb = OCFS2_SB(dir->i_sb); 328 osb = OCFS2_SB(dir->i_sb);
329 329
330 status = ocfs2_meta_lock(dir, NULL, &parent_fe_bh, 1); 330 status = ocfs2_meta_lock(dir, &parent_fe_bh, 1);
331 if (status < 0) { 331 if (status < 0) {
332 if (status != -ENOENT) 332 if (status != -ENOENT)
333 mlog_errno(status); 333 mlog_errno(status);
@@ -658,7 +658,7 @@ static int ocfs2_link(struct dentry *old_dentry,
658 if (S_ISDIR(inode->i_mode)) 658 if (S_ISDIR(inode->i_mode))
659 return -EPERM; 659 return -EPERM;
660 660
661 err = ocfs2_meta_lock(dir, NULL, &parent_fe_bh, 1); 661 err = ocfs2_meta_lock(dir, &parent_fe_bh, 1);
662 if (err < 0) { 662 if (err < 0) {
663 if (err != -ENOENT) 663 if (err != -ENOENT)
664 mlog_errno(err); 664 mlog_errno(err);
@@ -683,7 +683,7 @@ static int ocfs2_link(struct dentry *old_dentry,
683 goto out; 683 goto out;
684 } 684 }
685 685
686 err = ocfs2_meta_lock(inode, NULL, &fe_bh, 1); 686 err = ocfs2_meta_lock(inode, &fe_bh, 1);
687 if (err < 0) { 687 if (err < 0) {
688 if (err != -ENOENT) 688 if (err != -ENOENT)
689 mlog_errno(err); 689 mlog_errno(err);
@@ -825,7 +825,7 @@ static int ocfs2_unlink(struct inode *dir,
825 return -EPERM; 825 return -EPERM;
826 } 826 }
827 827
828 status = ocfs2_meta_lock(dir, NULL, &parent_node_bh, 1); 828 status = ocfs2_meta_lock(dir, &parent_node_bh, 1);
829 if (status < 0) { 829 if (status < 0) {
830 if (status != -ENOENT) 830 if (status != -ENOENT)
831 mlog_errno(status); 831 mlog_errno(status);
@@ -850,7 +850,7 @@ static int ocfs2_unlink(struct inode *dir,
850 goto leave; 850 goto leave;
851 } 851 }
852 852
853 status = ocfs2_meta_lock(inode, NULL, &fe_bh, 1); 853 status = ocfs2_meta_lock(inode, &fe_bh, 1);
854 if (status < 0) { 854 if (status < 0) {
855 if (status != -ENOENT) 855 if (status != -ENOENT)
856 mlog_errno(status); 856 mlog_errno(status);
@@ -1012,7 +1012,7 @@ static int ocfs2_double_lock(struct ocfs2_super *osb,
1012 inode1 = tmpinode; 1012 inode1 = tmpinode;
1013 } 1013 }
1014 /* lock id2 */ 1014 /* lock id2 */
1015 status = ocfs2_meta_lock(inode2, NULL, bh2, 1); 1015 status = ocfs2_meta_lock(inode2, bh2, 1);
1016 if (status < 0) { 1016 if (status < 0) {
1017 if (status != -ENOENT) 1017 if (status != -ENOENT)
1018 mlog_errno(status); 1018 mlog_errno(status);
@@ -1021,7 +1021,7 @@ static int ocfs2_double_lock(struct ocfs2_super *osb,
1021 } 1021 }
1022 1022
1023 /* lock id1 */ 1023 /* lock id1 */
1024 status = ocfs2_meta_lock(inode1, NULL, bh1, 1); 1024 status = ocfs2_meta_lock(inode1, bh1, 1);
1025 if (status < 0) { 1025 if (status < 0) {
1026 /* 1026 /*
1027 * An error return must mean that no cluster locks 1027 * An error return must mean that no cluster locks
@@ -1142,7 +1142,7 @@ static int ocfs2_rename(struct inode *old_dir,
1142 * the vote thread on other nodes won't have to concurrently 1142 * the vote thread on other nodes won't have to concurrently
1143 * downconvert the inode and the dentry locks. 1143 * downconvert the inode and the dentry locks.
1144 */ 1144 */
1145 status = ocfs2_meta_lock(old_inode, NULL, NULL, 1); 1145 status = ocfs2_meta_lock(old_inode, NULL, 1);
1146 if (status < 0) { 1146 if (status < 0) {
1147 if (status != -ENOENT) 1147 if (status != -ENOENT)
1148 mlog_errno(status); 1148 mlog_errno(status);
@@ -1234,7 +1234,7 @@ static int ocfs2_rename(struct inode *old_dir,
1234 goto bail; 1234 goto bail;
1235 } 1235 }
1236 1236
1237 status = ocfs2_meta_lock(new_inode, NULL, &newfe_bh, 1); 1237 status = ocfs2_meta_lock(new_inode, &newfe_bh, 1);
1238 if (status < 0) { 1238 if (status < 0) {
1239 if (status != -ENOENT) 1239 if (status != -ENOENT)
1240 mlog_errno(status); 1240 mlog_errno(status);
@@ -1608,7 +1608,7 @@ static int ocfs2_symlink(struct inode *dir,
1608 credits = ocfs2_calc_symlink_credits(sb); 1608 credits = ocfs2_calc_symlink_credits(sb);
1609 1609
1610 /* lock the parent directory */ 1610 /* lock the parent directory */
1611 status = ocfs2_meta_lock(dir, NULL, &parent_fe_bh, 1); 1611 status = ocfs2_meta_lock(dir, &parent_fe_bh, 1);
1612 if (status < 0) { 1612 if (status < 0) {
1613 if (status != -ENOENT) 1613 if (status != -ENOENT)
1614 mlog_errno(status); 1614 mlog_errno(status);
@@ -2127,7 +2127,7 @@ static int ocfs2_prepare_orphan_dir(struct ocfs2_super *osb,
2127 2127
2128 mutex_lock(&orphan_dir_inode->i_mutex); 2128 mutex_lock(&orphan_dir_inode->i_mutex);
2129 2129
2130 status = ocfs2_meta_lock(orphan_dir_inode, NULL, &orphan_dir_bh, 1); 2130 status = ocfs2_meta_lock(orphan_dir_inode, &orphan_dir_bh, 1);
2131 if (status < 0) { 2131 if (status < 0) {
2132 mlog_errno(status); 2132 mlog_errno(status);
2133 goto leave; 2133 goto leave;