Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db8109ef authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by Jan Kara
Browse files

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: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent f007dbf8

fs/udf/super.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -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_op = &udf_sb_ops;

	sb->s_export_op = &udf_export_ops;

	sb->s_export_op = &udf_export_ops;





	sb->s_dirt = 0;

	sb->s_magic = UDF_SUPER_MAGIC;

	sb->s_magic = UDF_SUPER_MAGIC;

	sb->s_time_gran = 1000;

	sb->s_time_gran = 1000;
@@ -2096,10 +2095,6 @@ void _udf_err(struct super_block *sb, const char *function, 
	struct va_format vaf;

	struct va_format vaf;

	va_list args;

	va_list args;





	/* mark sb error */

	if (!(sb->s_flags & MS_RDONLY))

		sb->s_dirt = 1;



	va_start(args, fmt);

	va_start(args, fmt);





	vaf.fmt = fmt;

	vaf.fmt = fmt;
@@ -2161,7 +2156,6 @@ static int udf_sync_fs(struct super_block *sb, int wait) 
		 * the buffer for IO

		 * the buffer for IO

		 */

		 */

		mark_buffer_dirty(sbi->s_lvid_bh);

		mark_buffer_dirty(sbi->s_lvid_bh);

		sb->s_dirt = 0;

		sbi->s_lvid_dirty = 0;

		sbi->s_lvid_dirty = 0;

	}

	}

	mutex_unlock(&sbi->s_alloc_mutex);

	mutex_unlock(&sbi->s_alloc_mutex);

fs/udf/udfdecl.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,6 @@ static inline void udf_updated_lvid(struct super_block *sb) 
	WARN_ON_ONCE(((struct logicalVolIntegrityDesc *)

	WARN_ON_ONCE(((struct logicalVolIntegrityDesc *)

		     bh->b_data)->integrityType !=

		     bh->b_data)->integrityType !=

		     cpu_to_le32(LVID_INTEGRITY_TYPE_OPEN));

		     cpu_to_le32(LVID_INTEGRITY_TYPE_OPEN));

	sb->s_dirt = 1;

	UDF_SB(sb)->s_lvid_dirty = 1;

	UDF_SB(sb)->s_lvid_dirty = 1;

}

}

extern u64 lvid_get_unique_id(struct super_block *sb);

extern u64 lvid_get_unique_id(struct super_block *sb);