From patchwork Thu May 16 08:49:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Pervushin X-Patchwork-Id: 16974 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AD33423903 for ; Thu, 16 May 2013 08:50:13 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id i72sf3756519yha.4 for ; Thu, 16 May 2013 01:49:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=jus3JvHji9L7tGnVbHwzvfwRd4/edz/PQZSNUts+Htc=; b=kSS1r7RpovnbvfLxoSaPGSKyyQ7VSn8J40JOU30BRny/inJpSwU0iIFy6b3o7A/jlh 6Jh8nZ+EZZGZ/Sg2ZjHDEFBfSOGch+VO8knH9RKODY70esFw/BsKDPX6zuBVtvN1Spoh X5T5ndnX+5ZDFUx0WNGQmKMFKeoXMup72RIe5QeSvoiIhJROvb4upsUDEAzKGhhn0gAd CnvXj+eJGSqshuXacxTLqafYeYXhC7Nc7XA90ESTd/tUsX+GoXkv0LQOXkwQSM0416KX BLAGhy1A2d/Vwhh6W/+YDYFG3p3gSNIvM4USmzltAiJh+FAsyxwOZDySaxGn+nztl+Hr 4g0g== X-Received: by 10.236.152.165 with SMTP id d25mr15841491yhk.36.1368694174749; Thu, 16 May 2013 01:49:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.86.202 with SMTP id r10ls1201255qez.86.gmail; Thu, 16 May 2013 01:49:34 -0700 (PDT) X-Received: by 10.52.32.194 with SMTP id l2mr23009364vdi.14.1368694174438; Thu, 16 May 2013 01:49:34 -0700 (PDT) Received: from mail-ve0-x229.google.com (mail-ve0-x229.google.com [2607:f8b0:400c:c01::229]) by mx.google.com with ESMTPS id be2si3424766vcb.70.2013.05.16.01.49.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 May 2013 01:49:34 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::229 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::229; Received: by mail-ve0-f169.google.com with SMTP id jw11so2469512veb.14 for ; Thu, 16 May 2013 01:49:34 -0700 (PDT) X-Received: by 10.52.233.34 with SMTP id tt2mr22890090vdc.70.1368694174216; Thu, 16 May 2013 01:49:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.126.138 with SMTP id c10csp54522vcs; Thu, 16 May 2013 01:49:33 -0700 (PDT) X-Received: by 10.180.88.231 with SMTP id bj7mr22418423wib.5.1368694173136; Thu, 16 May 2013 01:49:33 -0700 (PDT) Received: from mail-wi0-x236.google.com (mail-wi0-x236.google.com [2a00:1450:400c:c05::236]) by mx.google.com with ESMTPS id t9si1005800wiv.63.2013.05.16.01.49.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 May 2013 01:49:33 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::236 is neither permitted nor denied by best guess record for domain of dmitry.pervushin@linaro.org) client-ip=2a00:1450:400c:c05::236; Received: by mail-wi0-f182.google.com with SMTP id c10so2458667wiw.3 for ; Thu, 16 May 2013 01:49:32 -0700 (PDT) X-Received: by 10.180.76.103 with SMTP id j7mr22500188wiw.21.1368694172681; Thu, 16 May 2013 01:49:32 -0700 (PDT) Received: from localhost.localdomain (ANice-652-1-300-72.w83-197.abo.wanadoo.fr. [83.197.63.72]) by mx.google.com with ESMTPSA id d5sm2269026wic.1.2013.05.16.01.49.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 May 2013 01:49:31 -0700 (PDT) From: dmitry pervushin To: axel.fagerstedt@linaro.org Cc: patches@linaro.org, dmitry pervushin Subject: [PATCH 1/3] VFAT GET_VOLUME_ID ioctl Date: Thu, 16 May 2013 10:49:02 +0200 Message-Id: <1368694144-20863-1-git-send-email-dmitry.pervushin@linaro.org> X-Mailer: git-send-email 1.8.1.2 X-Gm-Message-State: ALoCoQlQ79MURnkslNwYkaxFruTQSXmgkhKuLg9h3NMO4t989PgY1d4QGnPqTrjLd42OfTbpbniN X-Original-Sender: dmitry.pervushin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::229 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Rename VFAT_IOCTL_GET_VOLUME_ID to VFAT_IOCTL_GET_VOLUME_ID_BROKEN This ioctl returns the volume id via return value, which might be incorrect in some cases, for example, if id is 0xFFFFFDAD, that matches -ENOIOCTL. So this ioctl will be deprecated and kept only for compatibility. Signed-off-by: dmitry pervushin --- fs/fat/dir.c | 2 +- include/uapi/linux/msdos_fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fat/dir.c b/fs/fat/dir.c index 1e1d3cb..eef52ee 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -799,7 +799,7 @@ static long fat_dir_ioctl(struct file *filp, unsigned int cmd, short_only = 0; both = 1; break; - case VFAT_IOCTL_GET_VOLUME_ID: + case VFAT_IOCTL_GET_VOLUME_ID_BROKEN: return fat_ioctl_volume_id(inode); default: return fat_generic_ioctl(filp, cmd, arg); diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h index db4ae0c..fddfc61 100644 --- a/include/uapi/linux/msdos_fs.h +++ b/include/uapi/linux/msdos_fs.h @@ -104,7 +104,7 @@ struct __fat_dirent { /* has used 0x72 ('r') in collision, so skip a few */ #define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) #define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32) -#define VFAT_IOCTL_GET_VOLUME_ID _IOR('r', 0x12, __u32) +#define VFAT_IOCTL_GET_VOLUME_ID_BROKEN _IOR('r', 0x12, __u32) struct fat_boot_sector { __u8 ignored[3]; /* Boot strap short or near jump */