Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755105AbZFELOh (ORCPT ); Fri, 5 Jun 2009 07:14:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754491AbZFELNd (ORCPT ); Fri, 5 Jun 2009 07:13:33 -0400 Received: from smtp.nokia.com ([192.100.122.233]:52259 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754203AbZFELN2 (ORCPT ); Fri, 5 Jun 2009 07:13:28 -0400 From: Artem Bityutskiy To: Al Viro Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Christoph Hellwig , Artem Bityutskiy Subject: [PATCH v2.1 09/17] HFSPLUS: do not manipulate s_dirt directly Date: Fri, 5 Jun 2009 16:05:47 +0300 Message-Id: <1244207155-2092-10-git-send-email-dedekind@infradead.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1244207155-2092-1-git-send-email-dedekind@infradead.org> References: <1244207155-2092-1-git-send-email-dedekind@infradead.org> X-OriginalArrivalTime: 05 Jun 2009 11:13:03.0181 (UTC) FILETIME=[97EEE7D0:01C9E5CE] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4894 Lines: 151 From: Artem Bityutskiy ... use new VFS helpers instead. Signed-off-by: Artem Bityutskiy --- fs/hfsplus/bitmap.c | 4 ++-- fs/hfsplus/dir.c | 2 +- fs/hfsplus/inode.c | 6 +++--- fs/hfsplus/super.c | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c index ea30afc..345b0e3 100644 --- a/fs/hfsplus/bitmap.c +++ b/fs/hfsplus/bitmap.c @@ -151,7 +151,7 @@ done: kunmap(page); *max = offset + (curr - pptr) * 32 + i - start; HFSPLUS_SB(sb).free_blocks -= *max; - sb->s_dirt = 1; + mark_sb_dirty(sb); dprint(DBG_BITMAP, "-> %u,%u\n", start, *max); out: mutex_unlock(&HFSPLUS_SB(sb).alloc_file->i_mutex); @@ -225,7 +225,7 @@ out: set_page_dirty(page); kunmap(page); HFSPLUS_SB(sb).free_blocks += len; - sb->s_dirt = 1; + mark_sb_dirty(sb); mutex_unlock(&HFSPLUS_SB(sb).alloc_file->i_mutex); return 0; diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 5f40236..71868b5 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c @@ -305,7 +305,7 @@ static int hfsplus_link(struct dentry *src_dentry, struct inode *dst_dir, inode->i_ctime = CURRENT_TIME_SEC; mark_inode_dirty(inode); HFSPLUS_SB(sb).file_count++; - sb->s_dirt = 1; + mark_sb_dirty(sb); return 0; } diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index 1bcf597..76fe933 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c @@ -333,7 +333,7 @@ struct inode *hfsplus_new_inode(struct super_block *sb, int mode) HFSPLUS_SB(sb).file_count++; insert_inode_hash(inode); mark_inode_dirty(inode); - sb->s_dirt = 1; + mark_sb_dirty(sb); return inode; } @@ -344,7 +344,7 @@ void hfsplus_delete_inode(struct inode *inode) if (S_ISDIR(inode->i_mode)) { HFSPLUS_SB(sb).folder_count--; - sb->s_dirt = 1; + mark_sb_dirty(sb); return; } HFSPLUS_SB(sb).file_count--; @@ -357,7 +357,7 @@ void hfsplus_delete_inode(struct inode *inode) inode->i_size = 0; hfsplus_file_truncate(inode); } - sb->s_dirt = 1; + mark_sb_dirty(sb); } void hfsplus_inode_read_fork(struct inode *inode, struct hfsplus_fork_raw *fork) diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 1aab8aa..4be3653 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -104,7 +104,7 @@ static int hfsplus_write_inode(struct inode *inode, int unused) case HFSPLUS_EXT_CNID: if (vhdr->ext_file.total_size != cpu_to_be64(inode->i_size)) { HFSPLUS_SB(inode->i_sb).flags |= HFSPLUS_SB_WRITEBACKUP; - inode->i_sb->s_dirt = 1; + mark_sb_dirty(inode->i_sb); } hfsplus_inode_write_fork(inode, &vhdr->ext_file); hfs_btree_write(HFSPLUS_SB(inode->i_sb).ext_tree); @@ -112,7 +112,7 @@ static int hfsplus_write_inode(struct inode *inode, int unused) case HFSPLUS_CAT_CNID: if (vhdr->cat_file.total_size != cpu_to_be64(inode->i_size)) { HFSPLUS_SB(inode->i_sb).flags |= HFSPLUS_SB_WRITEBACKUP; - inode->i_sb->s_dirt = 1; + mark_sb_dirty(inode->i_sb); } hfsplus_inode_write_fork(inode, &vhdr->cat_file); hfs_btree_write(HFSPLUS_SB(inode->i_sb).cat_tree); @@ -120,21 +120,21 @@ static int hfsplus_write_inode(struct inode *inode, int unused) case HFSPLUS_ALLOC_CNID: if (vhdr->alloc_file.total_size != cpu_to_be64(inode->i_size)) { HFSPLUS_SB(inode->i_sb).flags |= HFSPLUS_SB_WRITEBACKUP; - inode->i_sb->s_dirt = 1; + mark_sb_dirty(inode->i_sb); } hfsplus_inode_write_fork(inode, &vhdr->alloc_file); break; case HFSPLUS_START_CNID: if (vhdr->start_file.total_size != cpu_to_be64(inode->i_size)) { HFSPLUS_SB(inode->i_sb).flags |= HFSPLUS_SB_WRITEBACKUP; - inode->i_sb->s_dirt = 1; + mark_sb_dirty(inode->i_sb); } hfsplus_inode_write_fork(inode, &vhdr->start_file); break; case HFSPLUS_ATTR_CNID: if (vhdr->attr_file.total_size != cpu_to_be64(inode->i_size)) { HFSPLUS_SB(inode->i_sb).flags |= HFSPLUS_SB_WRITEBACKUP; - inode->i_sb->s_dirt = 1; + mark_sb_dirty(inode->i_sb); } hfsplus_inode_write_fork(inode, &vhdr->attr_file); hfs_btree_write(HFSPLUS_SB(inode->i_sb).attr_tree); @@ -159,7 +159,7 @@ static void hfsplus_write_super(struct super_block *sb) dprint(DBG_SUPER, "hfsplus_write_super\n"); lock_super(sb); - sb->s_dirt = 0; + mark_sb_clean(sb); if (sb->s_flags & MS_RDONLY) /* warn? */ goto out; @@ -206,7 +206,7 @@ static void hfsplus_put_super(struct super_block *sb) lock_kernel(); - if (sb->s_dirt) + if (is_sb_dirty(sb)) hfsplus_write_super(sb); if (!(sb->s_flags & MS_RDONLY) && HFSPLUS_SB(sb).s_vhdr) { struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr; -- 1.6.0.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/