From patchwork Wed Feb 9 14:05:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 544081 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p19E5akD030249 for ; Wed, 9 Feb 2011 14:05:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755329Ab1BIOFd (ORCPT ); Wed, 9 Feb 2011 09:05:33 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:62387 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755009Ab1BIOFd (ORCPT ); Wed, 9 Feb 2011 09:05:33 -0500 Received: by fxm20 with SMTP id 20so223592fxm.19 for ; Wed, 09 Feb 2011 06:05:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=m8jvPyqlQPs0ClJkgPcGoSk8SRCJIxQs1beQ1Z2Nlcs=; b=n5nBO8zurtYCB6oaB3w7Ch3EtShpCD0YyMydOh4oKWN/jSB/FrZ0RrKUV/BgcvmVmR modTae31eoDxDcZELBrGtH6V/iZqrexdx9ezrexEnxUSPoWEqGFPzV+bCWXCMCaXacuN v6gOgMyoCdUhk6atKOmi+BIeMAZzjDX64A1ys= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=sMZi5XqfUggl7wXEuZt+AJcLYoQY+wIEH++Ra0KXybEKCXBvu0Zmx17CMHOzQOb/fT 4UjF2NdhH6jKlMUwpzNRBSoWMde0GjQUy4vxhxKjuNxbcconeRl8sQi8os2LDGrRh7pw yT6IDXWdtj8NFYjNrs8CEz6NrGbjGEakpv95Y= Received: by 10.223.106.129 with SMTP id x1mr120577fao.13.1297260331763; Wed, 09 Feb 2011 06:05:31 -0800 (PST) Received: from localhost ([46.35.254.12]) by mx.google.com with ESMTPS id a6sm566544fak.1.2011.02.09.06.05.30 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Feb 2011 06:05:30 -0800 (PST) Date: Wed, 9 Feb 2011 16:05:31 +0200 From: Ilya Dryomov To: linux-btrfs@vger.kernel.org Cc: Chris Mason Subject: [PATCH] Btrfs - use %pU to print fsid Message-ID: <20110209140531.GA26945@kwango.lan.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 09 Feb 2011 14:05:37 +0000 (UTC) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 2636a05..83b789c 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -714,12 +714,8 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, transid = btrfs_super_generation(disk_super); if (disk_super->label[0]) printk(KERN_INFO "device label %s ", disk_super->label); - else { - /* FIXME, make a readl uuid parser */ - printk(KERN_INFO "device fsid %llx-%llx ", - *(unsigned long long *)disk_super->fsid, - *(unsigned long long *)(disk_super->fsid + 8)); - } + else + printk(KERN_INFO "device fsid %pU ", disk_super->fsid); printk(KERN_CONT "devid %llu transid %llu %s\n", (unsigned long long)devid, (unsigned long long)transid, path); ret = device_list_add(path, disk_super, devid, fs_devices_ret);