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

Commit b5f5914c authored by Al Viro's avatar Al Viro
Browse files

Merge branch 'ufs' into for-next

parents 15cf3b7a 4e317ce7

fs/ufs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ 
obj-$(CONFIG_UFS_FS) += ufs.o



ufs-objs := balloc.o cylinder.o dir.o file.o ialloc.o inode.o \

	    namei.o super.o symlink.o truncate.o util.o

	    namei.o super.o symlink.o util.o

ccflags-$(CONFIG_UFS_DEBUG)    += -DDEBUG

fs/ufs/balloc.c

+4 −0
Original line number Diff line number Diff line
@@ -417,7 +417,9 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment, 
	if (oldcount == 0) {

		result = ufs_alloc_fragments (inode, cgno, goal, count, err);

		if (result) {

			write_seqlock(&UFS_I(inode)->meta_lock);

			ufs_cpu_to_data_ptr(sb, p, result);

			write_sequnlock(&UFS_I(inode)->meta_lock);

			*err = 0;

			UFS_I(inode)->i_lastfrag =

				max(UFS_I(inode)->i_lastfrag, fragment + count);
@@ -473,7 +475,9 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment, 
		ufs_change_blocknr(inode, fragment - oldcount, oldcount,

				   uspi->s_sbbase + tmp,

				   uspi->s_sbbase + result, locked_page);

		write_seqlock(&UFS_I(inode)->meta_lock);

		ufs_cpu_to_data_ptr(sb, p, result);

		write_sequnlock(&UFS_I(inode)->meta_lock);

		*err = 0;

		UFS_I(inode)->i_lastfrag = max(UFS_I(inode)->i_lastfrag,

						fragment + count);