diff options
-rw-r--r-- | fs/ubifs/super.c | 8 | ||||
-rw-r--r-- | fs/ubifs/ubifs.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 2c268a476413..f71e6b8822c4 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c | |||
@@ -148,7 +148,7 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum) | |||
148 | if (err) | 148 | if (err) |
149 | goto out_invalid; | 149 | goto out_invalid; |
150 | 150 | ||
151 | /* Disable readahead */ | 151 | /* Disable read-ahead */ |
152 | inode->i_mapping->backing_dev_info = &c->bdi; | 152 | inode->i_mapping->backing_dev_info = &c->bdi; |
153 | 153 | ||
154 | switch (inode->i_mode & S_IFMT) { | 154 | switch (inode->i_mode & S_IFMT) { |
@@ -344,7 +344,7 @@ static void ubifs_delete_inode(struct inode *inode) | |||
344 | if (err) | 344 | if (err) |
345 | /* | 345 | /* |
346 | * Worst case we have a lost orphan inode wasting space, so a | 346 | * Worst case we have a lost orphan inode wasting space, so a |
347 | * simple error message is ok here. | 347 | * simple error message is OK here. |
348 | */ | 348 | */ |
349 | ubifs_err("can't delete inode %lu, error %d", | 349 | ubifs_err("can't delete inode %lu, error %d", |
350 | inode->i_ino, err); | 350 | inode->i_ino, err); |
@@ -1683,10 +1683,10 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) | |||
1683 | } | 1683 | } |
1684 | 1684 | ||
1685 | /* | 1685 | /* |
1686 | * UBIFS provids 'backing_dev_info' in order to disable readahead. For | 1686 | * UBIFS provides 'backing_dev_info' in order to disable read-ahead. For |
1687 | * UBIFS, I/O is not deferred, it is done immediately in readpage, | 1687 | * UBIFS, I/O is not deferred, it is done immediately in readpage, |
1688 | * which means the user would have to wait not just for their own I/O | 1688 | * which means the user would have to wait not just for their own I/O |
1689 | * but the readahead I/O as well i.e. completely pointless. | 1689 | * but the read-ahead I/O as well i.e. completely pointless. |
1690 | * | 1690 | * |
1691 | * Read-ahead will be disabled because @c->bdi.ra_pages is 0. | 1691 | * Read-ahead will be disabled because @c->bdi.ra_pages is 0. |
1692 | */ | 1692 | */ |
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index f2dd749d7989..d7f706f7a302 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h | |||
@@ -20,8 +20,6 @@ | |||
20 | * Adrian Hunter | 20 | * Adrian Hunter |
21 | */ | 21 | */ |
22 | 22 | ||
23 | /* Implementation version 0.7 */ | ||
24 | |||
25 | #ifndef __UBIFS_H__ | 23 | #ifndef __UBIFS_H__ |
26 | #define __UBIFS_H__ | 24 | #define __UBIFS_H__ |
27 | 25 | ||