btrfs-progs: don't use <linux/fs.h>

[platform/upstream/btrfs-progs.git] / btrfs-convert.c

diff --git a/btrfs-convert.c b/btrfs-convert.c
index a9ac9a5..a1fb645 100644 (file)
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -21,10 +21,8 @@
 
 #include "kerncompat.h"
 
-#ifndef __CHECKER__
 #include <sys/ioctl.h>
 #include <sys/mount.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -33,7 +31,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <uuid/uuid.h>
-#include <linux/fs.h>
 
 #include "ctree.h"
 #include "disk-io.h"
@@ -225,7 +222,7 @@ static int custom_free_extent(struct btrfs_root *root, u64 bytenr,
        return intersect_with_sb(bytenr, num_bytes);
 }
 
-struct btrfs_extent_ops extent_ops = {
+static struct btrfs_extent_ops extent_ops = {
        .alloc_extent = custom_alloc_extent,
        .free_extent = custom_free_extent,
 };
@@ -1418,8 +1415,8 @@ fail:
        return ret;
 }
 
-struct btrfs_root *link_subvol(struct btrfs_root *root, const char *base,
-                              u64 root_objectid)
+static struct btrfs_root * link_subvol(struct btrfs_root *root,
+               const char *base, u64 root_objectid)
 {
        struct btrfs_trans_handle *trans;
        struct btrfs_fs_info *fs_info = root->fs_info;
@@ -2277,7 +2274,8 @@ err:
        return ret;
 }
 
-int do_convert(const char *devname, int datacsum, int packing, int noxattr)
+static int do_convert(const char *devname, int datacsum, int packing,
+               int noxattr)
 {
        int i, ret;
        int fd = -1;
@@ -2456,7 +2454,7 @@ fail:
        return -1;
 }
 
-int do_rollback(const char *devname, int force)
+static int do_rollback(const char *devname, int force)
 {
        int fd = -1;
        int ret;