Btrfs: fix stop searching test in replace_one_extent

[safe/jmp/linux-2.6] / fs / btrfs / export.c

diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c
index 292b0b2..85315d2 100644 (file)
--- a/fs/btrfs/export.c
+++ b/fs/btrfs/export.c
@@ -7,15 +7,11 @@
 #include "export.h"
 #include "compat.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-#define FILEID_BTRFS_WITHOUT_PARENT            0x4d
-#define FILEID_BTRFS_WITH_PARENT               0x4e
-#define FILEID_BTRFS_WITH_PARENT_ROOT          0x4f
-#endif
-
-#define BTRFS_FID_SIZE_NON_CONNECTABLE         (offsetof(struct btrfs_fid, parent_objectid)/4)
-#define BTRFS_FID_SIZE_CONNECTABLE             (offsetof(struct btrfs_fid, parent_root_objectid)/4)
-#define BTRFS_FID_SIZE_CONNECTABLE_ROOT                (sizeof(struct btrfs_fid)/4)
+#define BTRFS_FID_SIZE_NON_CONNECTABLE (offsetof(struct btrfs_fid, \
+                                                parent_objectid) / 4)
+#define BTRFS_FID_SIZE_CONNECTABLE (offsetof(struct btrfs_fid, \
+                                            parent_root_objectid) / 4)
+#define BTRFS_FID_SIZE_CONNECTABLE_ROOT (sizeof(struct btrfs_fid) / 4)
 
 static int btrfs_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,
                           int connectable)
@@ -68,7 +64,6 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
 {
        struct btrfs_root *root;
        struct inode *inode;
-       struct dentry *result;
        struct btrfs_key key;
 
        key.objectid = root_objectid;
@@ -92,11 +87,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
                return ERR_PTR(-ESTALE);
        }
 
-       result = d_obtain_alias(inode);
-       if (!result)
-               return ERR_PTR(-ENOMEM);
-
-       return result;
+       return d_obtain_alias(inode);
 }
 
 static struct dentry *btrfs_fh_to_parent(struct super_block *sb, struct fid *fh,
@@ -148,8 +139,6 @@ static struct dentry *btrfs_fh_to_dentry(struct super_block *sb, struct fid *fh,
 static struct dentry *btrfs_get_parent(struct dentry *child)
 {
        struct inode *dir = child->d_inode;
-       struct inode *inode;
-       struct dentry *parent;
        struct btrfs_root *root = BTRFS_I(dir)->root;
        struct btrfs_key key;
        struct btrfs_path *path;
@@ -203,13 +192,7 @@ static struct dentry *btrfs_get_parent(struct dentry *child)
        btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
        key.offset = 0;
 
-       inode = btrfs_iget(root->fs_info->sb, &key, root, NULL);
-
-       parent = d_obtain_alias(inode);
-       if (!parent)
-               parent = ERR_PTR(-ENOMEM);
-
-       return parent;
+       return d_obtain_alias(btrfs_iget(root->fs_info->sb, &key, root, NULL));
 }
 
 const struct export_operations btrfs_export_ops = {