diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/isofs/rock.c | 2 | ||||
| -rw-r--r-- | fs/quota/quota.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c index 576498245b9d..6fe6dbd0c740 100644 --- a/fs/isofs/rock.c +++ b/fs/isofs/rock.c @@ -271,7 +271,7 @@ repeat: break; } len = rr->len - 5; - if (retnamlen + len >= 254) { + if (retnamlen + len > NAME_MAX) { truncate = 1; break; } diff --git a/fs/quota/quota.c b/fs/quota/quota.c index ed906725e183..33bacd707580 100644 --- a/fs/quota/quota.c +++ b/fs/quota/quota.c @@ -898,6 +898,7 @@ retry: sb_start_write(sb); sb_end_write(sb); put_super(sb); + cond_resched(); goto retry; } return sb; |