From patchwork Fri Mar 25 02:01:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yaowei Bai X-Patchwork-Id: 8667741 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1A8969F326 for ; Fri, 25 Mar 2016 02:11:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D125203AD for ; Fri, 25 Mar 2016 02:11:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25FC920220 for ; Fri, 25 Mar 2016 02:11:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751966AbcCYCLC (ORCPT ); Thu, 24 Mar 2016 22:11:02 -0400 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:12217 "EHLO cmccmta1.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751627AbcCYCLB (ORCPT ); Thu, 24 Mar 2016 22:11:01 -0400 X-Greylist: delayed 549 seconds by postgrey-1.27 at vger.kernel.org; Thu, 24 Mar 2016 22:11:00 EDT Received: from spf.mail.chinamobile.com (unknown[172.16.121.17]) by rmmx-syy-dmz-app04-12004 (RichMail) with SMTP id 2ee456f49c0cc69-cef91; Fri, 25 Mar 2016 10:01:48 +0800 (CST) X-RM-TRANSID: 2ee456f49c0cc69-cef91 X-RM-SPAM-FLAG: 00000000 Received: from localhost.localdomain (unknown[223.68.205.132]) by rmsmtp-syy-appsvr09-12009 (RichMail) with SMTP id 2ee956f49c0b834-fb264; Fri, 25 Mar 2016 10:01:48 +0800 (CST) X-RM-TRANSID: 2ee956f49c0b834-fb264 From: Yaowei Bai To: viro@zeniv.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, baiyaowei@cmss.chinamobile.com Subject: [PATCH] fs/vfs: improve __mnt_is_readonly Date: Fri, 25 Mar 2016 10:01:26 +0800 Message-Id: <1458871286-3099-1-git-send-email-baiyaowei@cmss.chinamobile.com> X-Mailer: git-send-email 1.9.1 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00,HK_RANDOM_FROM, RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch refactors __mnt_is_readonly and makes it return bool to improve readability due to this particular function only using either one or zero as its return value. No functional change. Signed-off-by: Yaowei Bai --- fs/namespace.c | 9 +++------ include/linux/mount.h | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index 4fb1691..4f2facd 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -271,13 +271,10 @@ out_free_cache: * mnt_want/drop_write() will _keep_ the filesystem * r/w. */ -int __mnt_is_readonly(struct vfsmount *mnt) +bool __mnt_is_readonly(struct vfsmount *mnt) { - if (mnt->mnt_flags & MNT_READONLY) - return 1; - if (mnt->mnt_sb->s_flags & MS_RDONLY) - return 1; - return 0; + return mnt->mnt_flags & MNT_READONLY || + mnt->mnt_sb->s_flags & MS_RDONLY; } EXPORT_SYMBOL_GPL(__mnt_is_readonly); diff --git a/include/linux/mount.h b/include/linux/mount.h index f822c3c..c143e15 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -80,7 +80,7 @@ extern void mnt_drop_write_file(struct file *file); extern void mntput(struct vfsmount *mnt); extern struct vfsmount *mntget(struct vfsmount *mnt); extern struct vfsmount *mnt_clone_internal(struct path *path); -extern int __mnt_is_readonly(struct vfsmount *mnt); +extern bool __mnt_is_readonly(struct vfsmount *mnt); struct path; extern struct vfsmount *clone_private_mount(struct path *path);