ocfs2: use ENOENT instead of EEXIST when get system file fails

When ocfs2_get_system_file_inode fails, it is obscure to set the return
value to -EEXIST. So change it to -ENOENT.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 3025c0da6b8abd6358a60581087a257dd4f24e6f..be71ca0937f742dce3bb4117c0e94fc8e093029c 100644 (file)
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -624,7 +624,7 @@ static int ocfs2_remove_inode(struct inode *inode,
                ocfs2_get_system_file_inode(osb, INODE_ALLOC_SYSTEM_INODE,
                                            le16_to_cpu(di->i_suballoc_slot));
        if (!inode_alloc_inode) {
-               status = -EEXIST;
+               status = -ENOENT;
                mlog_errno(status);
                goto bail;
        }
@@ -742,7 +742,7 @@ static int ocfs2_wipe_inode(struct inode *inode,
                                                               ORPHAN_DIR_SYSTEM_INODE,
                                                               orphaned_slot);
                if (!orphan_dir_inode) {
-                       status = -EEXIST;
+                       status = -ENOENT;
                        mlog_errno(status);
                        goto bail;
                }

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 49837404541e6139f47c28305c1de4f62d3e461e..09f90cbf0e24d39ee0f8b27b2d056273f4bdf879 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -2808,7 +2808,7 @@ int ocfs2_mv_orphaned_inode_to_new(struct inode *dir,
                                                       ORPHAN_DIR_SYSTEM_INODE,
                                                       osb->slot_num);
        if (!orphan_dir_inode) {
-               status = -EEXIST;
+               status = -ENOENT;
                mlog_errno(status);
                goto leave;
        }