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

Commit 86652188 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy 

Pull jfs fixes from David Kleikamp:
 "A couple fixes for jfs"

(What's with the unhelpful pull request "explanations" from fs people
today?)

* tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy:
  jfs: fix a couple races
  jfs: avoid undefined behavior from left-shifting by 32 bits
parents 14a9e5c0 73aaa22d

fs/jfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ int jfs_write_inode(struct inode *inode, struct writeback_control *wbc) 
{

	int wait = wbc->sync_mode == WB_SYNC_ALL;



	if (test_cflag(COMMIT_Nolink, inode))

	if (inode->i_nlink == 0)

		return 0;

	/*

	 * If COMMIT_DIRTY is not set, the inode isn't really dirty.

fs/jfs/jfs_imap.c

+1 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip) 
		/* mask any prior bits for the starting words of the

		 * summary map.

		 */

		mask = ONES << (EXTSPERSUM - bitno);

		mask = (bitno == 0) ? 0 : (ONES << (EXTSPERSUM - bitno));

		inosmap = le32_to_cpu(iagp->inosmap[sword]) | mask;

		extsmap = le32_to_cpu(iagp->extsmap[sword]) | mask;

fs/jfs/jfs_logmgr.c

+2 −1
Original line number Diff line number Diff line
@@ -1058,6 +1058,7 @@ static int lmLogSync(struct jfs_log * log, int hard_sync) 
 */

void jfs_syncpt(struct jfs_log *log, int hard_sync)

{	LOG_LOCK(log);

	if (!test_bit(log_QUIESCE, &log->flag))

		lmLogSync(log, hard_sync);

	LOG_UNLOCK(log);

}