diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
| commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
| tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /fs/ubifs/budget.c | |
| parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) | |
Patched in Tegra support.
Diffstat (limited to 'fs/ubifs/budget.c')
| -rw-r--r-- | fs/ubifs/budget.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index e8e01d74dc0..315de66e52b 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | static void shrink_liability(struct ubifs_info *c, int nr_to_write) | 63 | static void shrink_liability(struct ubifs_info *c, int nr_to_write) |
| 64 | { | 64 | { |
| 65 | down_read(&c->vfs_sb->s_umount); | 65 | down_read(&c->vfs_sb->s_umount); |
| 66 | writeback_inodes_sb(c->vfs_sb, WB_REASON_FS_FREE_SPACE); | 66 | writeback_inodes_sb(c->vfs_sb); |
| 67 | up_read(&c->vfs_sb->s_umount); | 67 | up_read(&c->vfs_sb->s_umount); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| @@ -272,8 +272,8 @@ long long ubifs_calc_available(const struct ubifs_info *c, int min_idx_lebs) | |||
| 272 | */ | 272 | */ |
| 273 | static int can_use_rp(struct ubifs_info *c) | 273 | static int can_use_rp(struct ubifs_info *c) |
| 274 | { | 274 | { |
| 275 | if (uid_eq(current_fsuid(), c->rp_uid) || capable(CAP_SYS_RESOURCE) || | 275 | if (current_fsuid() == c->rp_uid || capable(CAP_SYS_RESOURCE) || |
| 276 | (!gid_eq(c->rp_gid, GLOBAL_ROOT_GID) && in_group_p(c->rp_gid))) | 276 | (c->rp_gid != 0 && in_group_p(c->rp_gid))) |
| 277 | return 1; | 277 | return 1; |
| 278 | return 0; | 278 | return 0; |
| 279 | } | 279 | } |
| @@ -342,8 +342,9 @@ static int do_budget_space(struct ubifs_info *c) | |||
| 342 | lebs = c->lst.empty_lebs + c->freeable_cnt + c->idx_gc_cnt - | 342 | lebs = c->lst.empty_lebs + c->freeable_cnt + c->idx_gc_cnt - |
| 343 | c->lst.taken_empty_lebs; | 343 | c->lst.taken_empty_lebs; |
| 344 | if (unlikely(rsvd_idx_lebs > lebs)) { | 344 | if (unlikely(rsvd_idx_lebs > lebs)) { |
| 345 | dbg_budg("out of indexing space: min_idx_lebs %d (old %d), rsvd_idx_lebs %d", | 345 | dbg_budg("out of indexing space: min_idx_lebs %d (old %d), " |
| 346 | min_idx_lebs, c->bi.min_idx_lebs, rsvd_idx_lebs); | 346 | "rsvd_idx_lebs %d", min_idx_lebs, c->bi.min_idx_lebs, |
| 347 | rsvd_idx_lebs); | ||
| 347 | return -ENOSPC; | 348 | return -ENOSPC; |
| 348 | } | 349 | } |
| 349 | 350 | ||