From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: hfsplus: remove superflous rootflags field in hfsplus_inode_info Date: Tue, 12 Oct 2010 15:58:16 +0200 Message-ID: <20101012135816.GG26867@lst.de> References: <20101012135634.GA26867@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: linux-fsdevel@vger.kernel.org Return-path: Received: from verein.lst.de ([213.95.11.210]:51600 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932449Ab0JLN6R (ORCPT ); Tue, 12 Oct 2010 09:58:17 -0400 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id o9CDwG88027078 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Tue, 12 Oct 2010 15:58:16 +0200 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id o9CDwGlD027077 for linux-fsdevel@vger.kernel.org; Tue, 12 Oct 2010 15:58:16 +0200 Content-Disposition: inline In-Reply-To: <20101012135634.GA26867@lst.de> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: The rootflags field in hfsplus_inode_info only caches the immutable and append-only flags in the VFS inode, so we can easily get rid of it. Signed-off-by: Christoph Hellwig Index: linux-2.6/fs/hfsplus/catalog.c =================================================================== --- linux-2.6.orig/fs/hfsplus/catalog.c 2010-10-11 19:53:11.478003833 +0200 +++ linux-2.6/fs/hfsplus/catalog.c 2010-10-11 19:53:25.153340347 +0200 @@ -77,7 +77,6 @@ static void hfsplus_set_perms(struct ino perms->rootflags |= HFSPLUS_FLG_APPEND; else perms->rootflags &= ~HFSPLUS_FLG_APPEND; - HFSPLUS_I(inode)->rootflags = perms->rootflags; HFSPLUS_I(inode)->userflags = perms->userflags; perms->mode = cpu_to_be16(inode->i_mode); perms->owner = cpu_to_be32(inode->i_uid); Index: linux-2.6/fs/hfsplus/hfsplus_fs.h =================================================================== --- linux-2.6.orig/fs/hfsplus/hfsplus_fs.h 2010-10-11 19:53:45.780260404 +0200 +++ linux-2.6/fs/hfsplus/hfsplus_fs.h 2010-10-11 19:53:55.403280008 +0200 @@ -184,7 +184,7 @@ struct hfsplus_inode_info { * Protected by i_mutex. */ sector_t fs_blocks; - u8 rootflags, userflags; /* BSD system and user file flags */ + u8 userflags; /* BSD user file flags */ struct list_head open_dir_list; loff_t phys_size; Index: linux-2.6/fs/hfsplus/inode.c =================================================================== --- linux-2.6.orig/fs/hfsplus/inode.c 2010-10-11 19:53:33.846004413 +0200 +++ linux-2.6/fs/hfsplus/inode.c 2010-10-11 19:53:36.680005829 +0200 @@ -241,7 +241,6 @@ static void hfsplus_get_perms(struct ino mode = S_IFREG | ((S_IRUGO|S_IWUGO) & ~(sbi->umask)); inode->i_mode = mode; - HFSPLUS_I(inode)->rootflags = perms->rootflags; HFSPLUS_I(inode)->userflags = perms->userflags; if (perms->rootflags & HFSPLUS_FLG_IMMUTABLE) inode->i_flags |= S_IMMUTABLE; Index: linux-2.6/fs/hfsplus/ioctl.c =================================================================== --- linux-2.6.orig/fs/hfsplus/ioctl.c 2010-10-11 19:50:47.467253978 +0200 +++ linux-2.6/fs/hfsplus/ioctl.c 2010-10-11 19:53:03.041005900 +0200 @@ -26,9 +26,9 @@ static int hfsplus_ioctl_getflags(struct struct hfsplus_inode_info *hip = HFSPLUS_I(inode); unsigned int flags = 0; - if (hip->rootflags & HFSPLUS_FLG_IMMUTABLE) + if (inode->i_flags & S_IMMUTABLE) flags |= FS_IMMUTABLE_FL; - if (hip->rootflags & HFSPLUS_FLG_APPEND) + if (inode->i_flags |= S_APPEND) flags |= FS_APPEND_FL; if (hip->userflags & HFSPLUS_FLG_NODUMP) flags |= FS_NODUMP_FL; @@ -59,8 +59,8 @@ static int hfsplus_ioctl_setflags(struct mutex_lock(&inode->i_mutex); - if (flags & (FS_IMMUTABLE_FL|FS_APPEND_FL) || - hip->rootflags & (HFSPLUS_FLG_IMMUTABLE|HFSPLUS_FLG_APPEND)) { + if ((flags & (FS_IMMUTABLE_FL|FS_APPEND_FL)) || + inode->i_flags & (S_IMMUTABLE|S_APPEND)) { if (!capable(CAP_LINUX_IMMUTABLE)) { err = -EPERM; goto out_unlock_inode; @@ -72,20 +72,17 @@ static int hfsplus_ioctl_setflags(struct err = -EOPNOTSUPP; goto out_unlock_inode; } - if (flags & FS_IMMUTABLE_FL) { + + if (flags & FS_IMMUTABLE_FL) inode->i_flags |= S_IMMUTABLE; - hip->rootflags |= HFSPLUS_FLG_IMMUTABLE; - } else { + else inode->i_flags &= ~S_IMMUTABLE; - hip->rootflags &= ~HFSPLUS_FLG_IMMUTABLE; - } - if (flags & FS_APPEND_FL) { + + if (flags & FS_APPEND_FL) inode->i_flags |= S_APPEND; - hip->rootflags |= HFSPLUS_FLG_APPEND; - } else { + else inode->i_flags &= ~S_APPEND; - hip->rootflags &= ~HFSPLUS_FLG_APPEND; - } + if (flags & FS_NODUMP_FL) hip->userflags |= HFSPLUS_FLG_NODUMP; else