a couple fixes for jfs
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJRg9htAAoJEDaohF61QIxkD4AP/A4SRjnIyNOuN/pJ4PGfv6Ck 2c9102PvTrinLfgiMRU7TU6TfxP3IIcAYvf4l2gXVlmCbaMSSnd/POimW6caPRML DNrsdwdhH8kSOM3F5x3YQS6ZZo7ySUxj2Cnt74eg8Jiear6gC8Xhy7/kRvVA1a1w adDgqRuhgpbhPuzn1Al+ohy51hLzV+4CaeCphPLfzV1rSPrOlzeZIrhIPoE/PUr2 /8hMRzwiuRMTVYL2lur4OA5KtTfE2zZ7uRp4wzUoGmkG+FXVPe1xvCcOxhAC1H82 PwpflqFn9P9p9qPyBcRz7OtO2ME8CLQz9zKwvXuWBu3rr3Un/1v1f+0lZwl82ukv lNNYLdBMUFDUatz9OeYE8uWSkJ4g2JXVt5ZdsiVQiKb8/IDekD2h+krX1ZWiQsoo CGwdOgIfIAzCIglh3ge51NAymJwMo84oi2JtzLgPgZy3PteHiCRMChqYiocIqHjM pHOSU6k0RYmRrNlzrWdl76F/SvYYLbY9UDFFYMkq7SzZ73zt0vKv598ig1vDXsJN mCnfqkuBpHc8cZaPshyirU/BOJfUzXT5qK1ctqyHWmVhSf/5H8XLnyUu9gzhktJM u3H/DhXr6C6mCiOO9NHNWXgRNiQP8RV0aB29UF/s697yS3p05duPuSZcXsISFIzD DkzkwEJNc7uFbGDHLHl5 =hKDY -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
86652188f3
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -1058,7 +1058,8 @@ static int lmLogSync(struct jfs_log * log, int hard_sync)
|
|||
*/
|
||||
void jfs_syncpt(struct jfs_log *log, int hard_sync)
|
||||
{ LOG_LOCK(log);
|
||||
lmLogSync(log, hard_sync);
|
||||
if (!test_bit(log_QUIESCE, &log->flag))
|
||||
lmLogSync(log, hard_sync);
|
||||
LOG_UNLOCK(log);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче