diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-03 09:57:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-03 09:57:16 -0700 |
commit | 86652188f345edec56b0074a65f6db17f16eb359 (patch) | |
tree | cbaf3a5e62b0c05ac74043685f63abde29a80c25 /fs/jfs/inode.c | |
parent | 14a9e5c09d13aa36b88ea54b8b6134b60ff2a410 (diff) | |
parent | 73aaa22d5ffb2630456bac2f9a4ed9b81d0d7271 (diff) |
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
Diffstat (limited to 'fs/jfs/inode.c')
-rw-r--r-- | fs/jfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index b7dc47ba675e..77554b61d124 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -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. |