btrfs-progs: move btrfs_extref_hash() to hash.h

[platform/upstream/btrfs-progs.git] / cmds-fi-du.c

diff --git a/cmds-fi-du.c b/cmds-fi-du.c
index 2ffd917..895c242 100644 (file)
--- a/cmds-fi-du.c
+++ b/cmds-fi-du.c
@@ -27,8 +27,13 @@
 
 #include <sys/ioctl.h>
 #include <linux/fs.h>
+#include <linux/version.h>
 #include <linux/fiemap.h>
 
+#if !defined(FIEMAP_EXTENT_SHARED) && (HAVE_OWN_FIEMAP_EXTENT_SHARED_DEFINE == 1)
+#define FIEMAP_EXTENT_SHARED           0x00002000
+#endif
+
 #include "utils.h"
 #include "commands.h"
 #include "kerncompat.h"
@@ -79,11 +84,11 @@ static int add_shared_extent(u64 start, u64 len, struct rb_root *root)
 {
        struct shared_extent *sh;
 
-       BUG_ON(len == 0);
+       ASSERT(len != 0);
 
        sh = calloc(1, sizeof(*sh));
        if (!sh)
-               return ENOMEM;
+               return -ENOMEM;
 
        sh->start = start;
        sh->last = (start + len - 1);
@@ -153,7 +158,7 @@ static u64 count_unique_bytes(struct rb_root *root, struct shared_extent *n)
 
 /*
  * What we want to do here is get a count of shared bytes within the
- * set of extents we have collected. Specifcally, we don't want to
+ * set of extents we have collected. Specifically, we don't want to
  * count any byte more than once, so just adding them up doesn't
  * work.
  *
@@ -228,12 +233,12 @@ static int mark_inode_seen(u64 ino, u64 subvol)
                else if (cmp > 0)
                        p = &(*p)->rb_right;
                else
-                       BUG();
+                       return -EEXIST;
        }
 
        si = calloc(1, sizeof(*si));
        if (!si)
-               return ENOMEM;
+               return -ENOMEM;
 
        si->i_ino = ino;
        si->i_subvol = subvol;
@@ -259,7 +264,7 @@ static int inode_seen(u64 ino, u64 subvol)
                else if (cmp > 0)
                        n = n->rb_right;
                else
-                       return EEXIST;
+                       return -EEXIST;
        }
        return 0;
 }
@@ -308,7 +313,7 @@ static int du_calc_file_space(int fd, struct rb_root *shared_extents,
                fiemap->fm_extent_count = count;
                rc = ioctl(fd, FS_IOC_FIEMAP, (unsigned long) fiemap);
                if (rc < 0) {
-                       ret = errno;
+                       ret = -errno;
                        goto out;
                }
 
@@ -326,6 +331,12 @@ static int du_calc_file_space(int fd, struct rb_root *shared_extents,
                        if (flags & SKIP_FLAGS)
                                continue;
 
+                       if (ext_len == 0) {
+                               warning("extent %llu has length 0, skipping",
+                                       (unsigned long long)fm_ext[i].fe_physical);
+                               continue;
+                       }
+
                        file_total += ext_len;
                        if (flags & FIEMAP_EXTENT_SHARED) {
                                file_shared += ext_len;
@@ -389,8 +400,14 @@ static int du_walk_dir(struct du_dir_ctxt *ctxt, struct rb_root *shared_extents)
                                                  dirfd(dirstream),
                                                  shared_extents, &tot, &shr,
                                                  0);
-                               if (ret)
+                               if (ret == -ENOTTY) {
+                                       continue;
+                               } else if (ret) {
+                                       fprintf(stderr,
+                                               "failed to walk dir/file: %s :%s\n",
+                                               entry->d_name, strerror(-ret));
                                        break;
+                               }
 
                                ctxt->bytes_total += tot;
                                ctxt->bytes_shared += shr;
@@ -418,17 +435,15 @@ static int du_add_file(const char *filename, int dirfd,
        DIR *dirstream = NULL;
 
        ret = fstatat(dirfd, filename, &st, 0);
-       if (ret) {
-               ret = errno;
-               return ret;
-       }
+       if (ret)
+               return -errno;
 
        if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode))
                return 0;
 
        if (len > (path_max - pathp)) {
                error("path too long: %s %s", path, filename);
-               return ENAMETOOLONG;
+               return -ENAMETOOLONG;
        }
 
        pathtmp = pathp;
@@ -438,9 +453,9 @@ static int du_add_file(const char *filename, int dirfd,
                ret = sprintf(pathp, "/%s", filename);
        pathp += ret;
 
-       fd = open_file_or_dir(path, &dirstream);
+       fd = open_file_or_dir3(path, &dirstream, O_RDONLY);
        if (fd < 0) {
-               ret = fd;
+               ret = -errno;
                goto out;
        }
 
@@ -536,10 +551,10 @@ int cmd_filesystem_du(int argc, char **argv)
 {
        int ret = 0, err = 0;
        int i;
+       u32 kernel_version;
 
        unit_mode = get_unit_mode_from_arg(&argc, argv, 1);
 
-       optind = 1;
        while (1) {
                static const struct option long_options[] = {
                        { "summarize", no_argument, NULL, 's'},
@@ -561,6 +576,14 @@ int cmd_filesystem_du(int argc, char **argv)
        if (check_argc_min(argc - optind, 1))
                usage(cmd_filesystem_du_usage);
 
+       kernel_version = get_running_kernel_version();
+
+       if (kernel_version < KERNEL_VERSION(2,6,33)) {
+               warning(
+"old kernel version detected, shared space will be reported as exclusive\n"
+"due to missing support for FIEMAP_EXTENT_SHARED flag");
+       }
+
        printf("%10s  %10s  %10s  %s\n", "Total", "Exclusive", "Set shared",
                        "Filename");
 
@@ -568,7 +591,7 @@ int cmd_filesystem_du(int argc, char **argv)
                ret = du_add_file(argv[i], AT_FDCWD, NULL, NULL, NULL, 1);
                if (ret) {
                        error("cannot check space of '%s': %s", argv[i],
-                                       strerror(ret));
+                                       strerror(-ret));
                        err = 1;
                }