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

Commit 31f48fc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull isofs and reiserfs fixes from Jan Kara:
 "A reiserfs and an isofs fix.  They arrived after I sent you my first
  pull request and I don't want to delay them unnecessarily till rc2"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  isofs: Fix infinite looping over CE entries
  reiserfs: destroy allocated commit workqueue
parents 0b233b7c f54e18f1

fs/isofs/rock.c

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct rock_state { 
	int cont_size;

	int cont_extent;

	int cont_offset;

	int cont_loops;

	struct inode *inode;

};
@@ -73,6 +74,9 @@ static void init_rock_state(struct rock_state *rs, struct inode *inode) 
	rs->inode = inode;

}



/* Maximum number of Rock Ridge continuation entries */

#define RR_MAX_CE_ENTRIES 32



/*

 * Returns 0 if the caller should continue scanning, 1 if the scan must end

 * and -ve on error.
@@ -105,6 +109,8 @@ static int rock_continue(struct rock_state *rs) 
			goto out;

		}

		ret = -EIO;

		if (++rs->cont_loops >= RR_MAX_CE_ENTRIES)

			goto out;

		bh = sb_bread(rs->inode->i_sb, rs->cont_extent);

		if (bh) {

			memcpy(rs->buffer, bh->b_data + rs->cont_offset,

fs/reiserfs/super.c

+3 −0
Original line number Diff line number Diff line
@@ -2172,6 +2172,9 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) 
		reiserfs_write_unlock(s);

	}



	if (sbi->commit_wq)

		destroy_workqueue(sbi->commit_wq);



	cancel_delayed_work_sync(&REISERFS_SB(s)->old_work);



	reiserfs_free_bitmap_cache(s);