From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 24 May 2016 01:12:41 +0000 (+0000)
Subject: btrfs.c: simplify BTRFS_IOC_GET_FSLABEL parser
X-Git-Tag: v4.12~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82b9e34e7c844c54484f8169c79e737528188b73;p=strace

btrfs.c: simplify BTRFS_IOC_GET_FSLABEL parser

* 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.
---

diff --git a/btrfs.c b/btrfs.c
index 4c02b891..dd0ae22a 100644
--- 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))