btrfs-progs: use the marco BTRFS_UPDATE_KERNEL where needed
authorAnand Jain <anand.jain@oracle.com>
Fri, 11 Oct 2013 11:52:54 +0000 (19:52 +0800)
committerChris Mason <chris.mason@fusionio.com>
Wed, 16 Oct 2013 12:23:13 +0000 (08:23 -0400)
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
cmds-device.c
utils.c

index 1315918..6f32356 100644 (file)
@@ -203,7 +203,7 @@ static int cmd_scan_dev(int argc, char **argv)
        if(argc<=devstart){
                int ret;
                printf("Scanning for Btrfs filesystems\n");
-               ret = scan_for_btrfs(where, 1);
+               ret = scan_for_btrfs(where, BTRFS_UPDATE_KERNEL);
                if (ret){
                        fprintf(stderr, "ERROR: error %d while scanning\n", ret);
                        return 1;
diff --git a/utils.c b/utils.c
index 69ae21f..a7441c1 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -961,7 +961,7 @@ int check_mounted_where(int fd, const char *file, char *where, int size,
 
        /* scan other devices */
        if (is_btrfs && total_devs > 1) {
-               if((ret = btrfs_scan_for_fsid(0)))
+               if ((ret = btrfs_scan_for_fsid(!BTRFS_UPDATE_KERNEL)))
                        return ret;
        }