diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-06-04 07:46:24 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2012-07-09 06:03:11 -0400 |
commit | db8109ef98b5fb7e26e0d265c02f7164b13009d4 (patch) | |
tree | 284fc6e5512e5617d0e0d42a9d4b71e5ac8cbe25 /fs/udf | |
parent | f007dbf8e51f4a0910194eebc2aa119eb861893e (diff) |
udf: stop using s_dirt
The UDF file-system does not need the 's_dirt' superblock flag because it does
not define the 'write_super()' method. This flag was set to 1 in few places and
set to 0 in '->sync_fs()' and was basically useless. Stop using it because it
is on its way out.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r-- | fs/udf/super.c | 6 | ||||
-rw-r--r-- | fs/udf/udfdecl.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 8d86a8706c0e..e7534fb84c2d 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
@@ -1974,7 +1974,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent) | |||
1974 | sb->s_op = &udf_sb_ops; | 1974 | sb->s_op = &udf_sb_ops; |
1975 | sb->s_export_op = &udf_export_ops; | 1975 | sb->s_export_op = &udf_export_ops; |
1976 | 1976 | ||
1977 | sb->s_dirt = 0; | ||
1978 | sb->s_magic = UDF_SUPER_MAGIC; | 1977 | sb->s_magic = UDF_SUPER_MAGIC; |
1979 | sb->s_time_gran = 1000; | 1978 | sb->s_time_gran = 1000; |
1980 | 1979 | ||
@@ -2096,10 +2095,6 @@ void _udf_err(struct super_block *sb, const char *function, | |||
2096 | struct va_format vaf; | 2095 | struct va_format vaf; |
2097 | va_list args; | 2096 | va_list args; |
2098 | 2097 | ||
2099 | /* mark sb error */ | ||
2100 | if (!(sb->s_flags & MS_RDONLY)) | ||
2101 | sb->s_dirt = 1; | ||
2102 | |||
2103 | va_start(args, fmt); | 2098 | va_start(args, fmt); |
2104 | 2099 | ||
2105 | vaf.fmt = fmt; | 2100 | vaf.fmt = fmt; |
@@ -2161,7 +2156,6 @@ static int udf_sync_fs(struct super_block *sb, int wait) | |||
2161 | * the buffer for IO | 2156 | * the buffer for IO |
2162 | */ | 2157 | */ |
2163 | mark_buffer_dirty(sbi->s_lvid_bh); | 2158 | mark_buffer_dirty(sbi->s_lvid_bh); |
2164 | sb->s_dirt = 0; | ||
2165 | sbi->s_lvid_dirty = 0; | 2159 | sbi->s_lvid_dirty = 0; |
2166 | } | 2160 | } |
2167 | mutex_unlock(&sbi->s_alloc_mutex); | 2161 | mutex_unlock(&sbi->s_alloc_mutex); |
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index ebe10314e512..de038da6f6bd 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
@@ -129,7 +129,6 @@ static inline void udf_updated_lvid(struct super_block *sb) | |||
129 | WARN_ON_ONCE(((struct logicalVolIntegrityDesc *) | 129 | WARN_ON_ONCE(((struct logicalVolIntegrityDesc *) |
130 | bh->b_data)->integrityType != | 130 | bh->b_data)->integrityType != |
131 | cpu_to_le32(LVID_INTEGRITY_TYPE_OPEN)); | 131 | cpu_to_le32(LVID_INTEGRITY_TYPE_OPEN)); |
132 | sb->s_dirt = 1; | ||
133 | UDF_SB(sb)->s_lvid_dirty = 1; | 132 | UDF_SB(sb)->s_lvid_dirty = 1; |
134 | } | 133 | } |
135 | extern u64 lvid_get_unique_id(struct super_block *sb); | 134 | extern u64 lvid_get_unique_id(struct super_block *sb); |