diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ubifs/budget.c | 14 | ||||
-rw-r--r-- | fs/ubifs/lpt_commit.c | 8 | ||||
-rw-r--r-- | fs/ubifs/ubifs.h | 1 |
3 files changed, 11 insertions, 12 deletions
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index 4d270f0a8564..31870d8dab84 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c | |||
@@ -652,9 +652,9 @@ void ubifs_release_dirty_inode_budget(struct ubifs_info *c, | |||
652 | * user-space. User-space application tend to expect that if the file-system | 652 | * user-space. User-space application tend to expect that if the file-system |
653 | * (e.g., via the 'statfs()' call) reports that it has N bytes available, they | 653 | * (e.g., via the 'statfs()' call) reports that it has N bytes available, they |
654 | * are able to write a file of size N. UBIFS attaches node headers to each data | 654 | * are able to write a file of size N. UBIFS attaches node headers to each data |
655 | * node and it has to write indexind nodes as well. This introduces additional | 655 | * node and it has to write indexing nodes as well. This introduces additional |
656 | * overhead, and UBIFS has to report sligtly less free space to meet the above | 656 | * overhead, and UBIFS has to report slightly less free space to meet the above |
657 | * expectetions. | 657 | * expectations. |
658 | * | 658 | * |
659 | * This function assumes free space is made up of uncompressed data nodes and | 659 | * This function assumes free space is made up of uncompressed data nodes and |
660 | * full index nodes (one per data node, tripled because we always allow enough | 660 | * full index nodes (one per data node, tripled because we always allow enough |
@@ -677,7 +677,7 @@ long long ubifs_reported_space(const struct ubifs_info *c, long long free) | |||
677 | * of data nodes, f - fanout. Because effective UBIFS fanout is twice | 677 | * of data nodes, f - fanout. Because effective UBIFS fanout is twice |
678 | * as less than maximum fanout, we assume that each data node | 678 | * as less than maximum fanout, we assume that each data node |
679 | * introduces 3 * @c->max_idx_node_sz / (@c->fanout/2 - 1) bytes. | 679 | * introduces 3 * @c->max_idx_node_sz / (@c->fanout/2 - 1) bytes. |
680 | * Note, the multiplier 3 is because UBIFS reseves thrice as more space | 680 | * Note, the multiplier 3 is because UBIFS reserves thrice as more space |
681 | * for the index. | 681 | * for the index. |
682 | */ | 682 | */ |
683 | f = c->fanout > 3 ? c->fanout >> 1 : 2; | 683 | f = c->fanout > 3 ? c->fanout >> 1 : 2; |
@@ -695,10 +695,10 @@ long long ubifs_reported_space(const struct ubifs_info *c, long long free) | |||
695 | * This function calculates amount of free space to report to user-space. | 695 | * This function calculates amount of free space to report to user-space. |
696 | * | 696 | * |
697 | * Because UBIFS may introduce substantial overhead (the index, node headers, | 697 | * Because UBIFS may introduce substantial overhead (the index, node headers, |
698 | * alighment, wastage at the end of eraseblocks, etc), it cannot report real | 698 | * alignment, wastage at the end of eraseblocks, etc), it cannot report real |
699 | * amount of free flash space it has (well, because not all dirty space is | 699 | * amount of free flash space it has (well, because not all dirty space is |
700 | * reclamable, UBIFS does not actually know the real amount). If UBIFS did so, | 700 | * reclaimable, UBIFS does not actually know the real amount). If UBIFS did so, |
701 | * it would bread user expectetion about what free space is. Users seem to | 701 | * it would bread user expectations about what free space is. Users seem to |
702 | * accustomed to assume that if the file-system reports N bytes of free space, | 702 | * accustomed to assume that if the file-system reports N bytes of free space, |
703 | * they would be able to fit a file of N bytes to the FS. This almost works for | 703 | * they would be able to fit a file of N bytes to the FS. This almost works for |
704 | * traditional file-systems, because they have way less overhead than UBIFS. | 704 | * traditional file-systems, because they have way less overhead than UBIFS. |
diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c index b8a060794239..96ca95707175 100644 --- a/fs/ubifs/lpt_commit.c +++ b/fs/ubifs/lpt_commit.c | |||
@@ -753,7 +753,7 @@ static void lpt_tgc_start(struct ubifs_info *c) | |||
753 | * LPT trivial garbage collection is where a LPT LEB contains only dirty and | 753 | * LPT trivial garbage collection is where a LPT LEB contains only dirty and |
754 | * free space and so may be reused as soon as the next commit is completed. | 754 | * free space and so may be reused as soon as the next commit is completed. |
755 | * This function is called after the commit is completed (master node has been | 755 | * This function is called after the commit is completed (master node has been |
756 | * written) and unmaps LPT LEBs that were marked for trivial GC. | 756 | * written) and un-maps LPT LEBs that were marked for trivial GC. |
757 | */ | 757 | */ |
758 | static int lpt_tgc_end(struct ubifs_info *c) | 758 | static int lpt_tgc_end(struct ubifs_info *c) |
759 | { | 759 | { |
@@ -1467,7 +1467,7 @@ void ubifs_lpt_free(struct ubifs_info *c, int wr_only) | |||
1467 | #ifdef CONFIG_UBIFS_FS_DEBUG | 1467 | #ifdef CONFIG_UBIFS_FS_DEBUG |
1468 | 1468 | ||
1469 | /** | 1469 | /** |
1470 | * dbg_is_all_ff - determine if a buffer contains only 0xff bytes. | 1470 | * dbg_is_all_ff - determine if a buffer contains only 0xFF bytes. |
1471 | * @buf: buffer | 1471 | * @buf: buffer |
1472 | * @len: buffer length | 1472 | * @len: buffer length |
1473 | */ | 1473 | */ |
@@ -1492,7 +1492,7 @@ static int dbg_is_nnode_dirty(struct ubifs_info *c, int lnum, int offs) | |||
1492 | struct ubifs_nnode *nnode; | 1492 | struct ubifs_nnode *nnode; |
1493 | int hght; | 1493 | int hght; |
1494 | 1494 | ||
1495 | /* Entire tree is in memory so first_nnode / next_nnode are ok */ | 1495 | /* Entire tree is in memory so first_nnode / next_nnode are OK */ |
1496 | nnode = first_nnode(c, &hght); | 1496 | nnode = first_nnode(c, &hght); |
1497 | for (; nnode; nnode = next_nnode(c, nnode, &hght)) { | 1497 | for (; nnode; nnode = next_nnode(c, nnode, &hght)) { |
1498 | struct ubifs_nbranch *branch; | 1498 | struct ubifs_nbranch *branch; |
@@ -1837,7 +1837,7 @@ int dbg_chk_lpt_sz(struct ubifs_info *c, int action, int len) | |||
1837 | * This function dumps an LEB from LPT area. Nodes in this area are very | 1837 | * This function dumps an LEB from LPT area. Nodes in this area are very |
1838 | * different to nodes in the main area (e.g., they do not have common headers, | 1838 | * different to nodes in the main area (e.g., they do not have common headers, |
1839 | * they do not have 8-byte alignments, etc), so we have a separate function to | 1839 | * they do not have 8-byte alignments, etc), so we have a separate function to |
1840 | * dump LPT area LEBs. Note, LPT has to be locked by the coller. | 1840 | * dump LPT area LEBs. Note, LPT has to be locked by the caller. |
1841 | */ | 1841 | */ |
1842 | static void dump_lpt_leb(const struct ubifs_info *c, int lnum) | 1842 | static void dump_lpt_leb(const struct ubifs_info *c, int lnum) |
1843 | { | 1843 | { |
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 3275c89a3585..fc2a4cc66d03 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h | |||
@@ -1168,7 +1168,6 @@ struct ubifs_debug_info; | |||
1168 | * @mount_opts: UBIFS-specific mount options | 1168 | * @mount_opts: UBIFS-specific mount options |
1169 | * | 1169 | * |
1170 | * @dbg: debugging-related information | 1170 | * @dbg: debugging-related information |
1171 | * @dfs: debugfs support-related information | ||
1172 | */ | 1171 | */ |
1173 | struct ubifs_info { | 1172 | struct ubifs_info { |
1174 | struct super_block *vfs_sb; | 1173 | struct super_block *vfs_sb; |