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

torvalds · torvalds · commit 31f48fc8f226 · 2014-12-16T15:46:01.000-08:00
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
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
@@ -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,
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2172,6 +2172,9 @@ static int reiserfs_fill_super(struct super_block s, void data, int silent)`
`2172`	`2172`	`reiserfs_write_unlock(s);`
`2173`	`2173`	`}`
`2174`	`2174`
	`2175`	`+ if (sbi->commit_wq)`
	`2176`	`+ destroy_workqueue(sbi->commit_wq);`
	`2177`	`+`
`2175`	`2178`	`cancel_delayed_work_sync(&REISERFS_SB(s)->old_work);`
`2176`	`2179`
`2177`	`2180`	`reiserfs_free_bitmap_cache(s);`