]> granicus.if.org Git - strace/commitdiff
btrfs.c: simplify BTRFS_IOC_GET_FSLABEL parser
authorDmitry V. Levin <ldv@altlinux.org>
Tue, 24 May 2016 01:12:41 +0000 (01:12 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Tue, 24 May 2016 14:52:27 +0000 (14:52 +0000)
* btrfs.c (btrfs_ioctl): Share code of parser of BTRFS_IOC_SET_FSLABEL
with parser of BTRFS_IOC_GET_FSLABEL only on BTRFS_IOC_GET_FSLABEL's
entering.

btrfs.c

diff --git a/btrfs.c b/btrfs.c
index 4c02b891cffeae349d99f72155855aa9f897ac60..dd0ae22a629552494d51c6d878ae60302095f5a8 100644 (file)
--- a/btrfs.c
+++ b/btrfs.c
@@ -1331,11 +1331,13 @@ btrfs_ioctl(struct tcb *tcp, const unsigned int code, const long arg)
                tprintf("{transid=%" PRI__u64 "}", args.transid);
                break;
        }
+
        case BTRFS_IOC_GET_FSLABEL: /* R */
-       case BTRFS_IOC_SET_FSLABEL: {/* W */
-               char label[BTRFS_LABEL_SIZE];
-               if (code == BTRFS_IOC_GET_FSLABEL && entering(tcp))
+               if (entering(tcp))
                        return 0;
+               /* fall through */
+       case BTRFS_IOC_SET_FSLABEL: { /* W */
+               char label[BTRFS_LABEL_SIZE];
 
                tprints(", ");
                if (umove_or_printaddr(tcp, arg, &label))