ocfs2: use retval instead of status for checking error

[deliverable/linux.git] / fs / ocfs2 / dir.c

diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index b08050bd3f2ef81a2c2f053042ac7e9e763e3718..a7f01f3cdda144461ba2ed84d1d453618131202b 100644 (file)
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -18,7 +18,7 @@
  *
  *   linux/fs/minix/dir.c
  *
- *   Copyright (C) 1991, 1992 Linux Torvalds
+ *   Copyright (C) 1991, 1992 Linus Torvalds
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -1617,7 +1617,7 @@ int __ocfs2_add_entry(handle_t *handle,
        struct ocfs2_dir_entry *de, *de1;
        struct ocfs2_dinode *di = (struct ocfs2_dinode *)parent_fe_bh->b_data;
        struct super_block *sb = dir->i_sb;
-       int retval, status;
+       int retval;
        unsigned int size = sb->s_blocksize;
        struct buffer_head *insert_bh = lookup->dl_leaf_bh;
        char *data_start = insert_bh->b_data;
@@ -1695,25 +1695,25 @@ int __ocfs2_add_entry(handle_t *handle,
                        }
 
                        if (insert_bh == parent_fe_bh)
-                               status = ocfs2_journal_access_di(handle,
+                               retval = ocfs2_journal_access_di(handle,
                                                                 INODE_CACHE(dir),
                                                                 insert_bh,
                                                                 OCFS2_JOURNAL_ACCESS_WRITE);
                        else {
-                               status = ocfs2_journal_access_db(handle,
+                               retval = ocfs2_journal_access_db(handle,
                                                                 INODE_CACHE(dir),
                                                                 insert_bh,
                                              OCFS2_JOURNAL_ACCESS_WRITE);
 
-                               if (ocfs2_dir_indexed(dir)) {
-                                       status = ocfs2_dx_dir_insert(dir,
+                               if (!retval && ocfs2_dir_indexed(dir))
+                                       retval = ocfs2_dx_dir_insert(dir,
                                                                handle,
                                                                lookup);
-                                       if (status) {
-                                               mlog_errno(status);
-                                               goto bail;
-                                       }
-                               }
+                       }
+
+                       if (retval) {
+                               mlog_errno(retval);
+                               goto bail;
                        }
 
                        /* By now the buffer is marked for journaling */
@@ -2047,22 +2047,19 @@ int ocfs2_check_dir_for_entry(struct inode *dir,
                              const char *name,
                              int namelen)
 {
-       int ret;
+       int ret = 0;
        struct ocfs2_dir_lookup_result lookup = { NULL, };
 
        trace_ocfs2_check_dir_for_entry(
                (unsigned long long)OCFS2_I(dir)->ip_blkno, namelen, name);
 
-       ret = -EEXIST;
-       if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0)
-               goto bail;
+       if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0) {
+               ret = -EEXIST;
+               mlog_errno(ret);
+       }
 
-       ret = 0;
-bail:
        ocfs2_free_dir_lookup_result(&lookup);
 
-       if (ret)
-               mlog_errno(ret);
        return ret;
 }