From 3749a0e6f3b0c21b1501bb76eb5fd3598f9b0fb0 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 4 Jun 2012 14:46:24 +0300 Subject: [PATCH] --- yaml --- r: 316699 b: refs/heads/master c: db8109ef98b5fb7e26e0d265c02f7164b13009d4 h: refs/heads/master i: 316697: f5cb80db5d5910b3116be8380bae475939890204 316695: fa004d1caf5e132ca7f8c7cfe33257dd2d48c952 v: v3 --- [refs] | 2 +- trunk/fs/udf/super.c | 6 ------ trunk/fs/udf/udfdecl.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 06e51e337136..1f35ea4b5f7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f007dbf8e51f4a0910194eebc2aa119eb861893e +refs/heads/master: db8109ef98b5fb7e26e0d265c02f7164b13009d4 diff --git a/trunk/fs/udf/super.c b/trunk/fs/udf/super.c index 8d86a8706c0e..e7534fb84c2d 100644 --- a/trunk/fs/udf/super.c +++ b/trunk/fs/udf/super.c @@ -1974,7 +1974,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent) sb->s_op = &udf_sb_ops; sb->s_export_op = &udf_export_ops; - sb->s_dirt = 0; sb->s_magic = UDF_SUPER_MAGIC; sb->s_time_gran = 1000; @@ -2096,10 +2095,6 @@ void _udf_err(struct super_block *sb, const char *function, struct va_format vaf; va_list args; - /* mark sb error */ - if (!(sb->s_flags & MS_RDONLY)) - sb->s_dirt = 1; - va_start(args, fmt); vaf.fmt = fmt; @@ -2161,7 +2156,6 @@ static int udf_sync_fs(struct super_block *sb, int wait) * the buffer for IO */ mark_buffer_dirty(sbi->s_lvid_bh); - sb->s_dirt = 0; sbi->s_lvid_dirty = 0; } mutex_unlock(&sbi->s_alloc_mutex); diff --git a/trunk/fs/udf/udfdecl.h b/trunk/fs/udf/udfdecl.h index ebe10314e512..de038da6f6bd 100644 --- a/trunk/fs/udf/udfdecl.h +++ b/trunk/fs/udf/udfdecl.h @@ -129,7 +129,6 @@ static inline void udf_updated_lvid(struct super_block *sb) WARN_ON_ONCE(((struct logicalVolIntegrityDesc *) bh->b_data)->integrityType != cpu_to_le32(LVID_INTEGRITY_TYPE_OPEN)); - sb->s_dirt = 1; UDF_SB(sb)->s_lvid_dirty = 1; } extern u64 lvid_get_unique_id(struct super_block *sb);