diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
| commit | 99dbb1632f1165c2726056ebfce6edde0e5a0208 (patch) | |
| tree | 2b2fc83db20b4c6d13842496899774b0dc2868e2 /fs/ext3 | |
| parent | aae6f989c6e97ff8197717fa4d032ad4eba091a7 (diff) | |
| parent | 9c33c512b2d3167a3580659942ee78437b1b1bc6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull the trivial tree from Jiri Kosina:
"Tiny usual fixes all over the place"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
doc: fix old config name of kprobetrace
fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
btrfs: fix the commment for the action flags in delayed-ref.h
btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
vfs: fix kerneldoc for generic_fh_to_parent()
treewide: fix comment/printk/variable typos
ipr: fix small coding style issues
doc: fix broken utf8 encoding
nfs: comment fix
platform/x86: fix asus_laptop.wled_type module parameter
mfd: printk/comment fixes
doc: getdelays.c: remember to close() socket on error in create_nl_socket()
doc: aliasing-test: close fd on write error
mmc: fix comment typos
dma: fix comments
spi: fix comment/printk typos in spi
Coccinelle: fix typo in memdup_user.cocci
tmiofb: missing NULL pointer checks
tools: perf: Fix typo in tools/perf
tools/testing: fix comment / output typos
...
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/balloc.c | 2 | ||||
| -rw-r--r-- | fs/ext3/inode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c index 90d901f0486..7320a66e958 100644 --- a/fs/ext3/balloc.c +++ b/fs/ext3/balloc.c | |||
| @@ -483,7 +483,7 @@ void ext3_discard_reservation(struct inode *inode) | |||
| 483 | * ext3_free_blocks_sb() -- Free given blocks and update quota | 483 | * ext3_free_blocks_sb() -- Free given blocks and update quota |
| 484 | * @handle: handle to this transaction | 484 | * @handle: handle to this transaction |
| 485 | * @sb: super block | 485 | * @sb: super block |
| 486 | * @block: start physcial block to free | 486 | * @block: start physical block to free |
| 487 | * @count: number of blocks to free | 487 | * @count: number of blocks to free |
| 488 | * @pdquot_freed_blocks: pointer to quota | 488 | * @pdquot_freed_blocks: pointer to quota |
| 489 | */ | 489 | */ |
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index ff574b4e345..7e87e37a372 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
| @@ -3207,7 +3207,7 @@ out_brelse: | |||
| 3207 | * | 3207 | * |
| 3208 | * - Within generic_file_write() for O_SYNC files. | 3208 | * - Within generic_file_write() for O_SYNC files. |
| 3209 | * Here, there will be no transaction running. We wait for any running | 3209 | * Here, there will be no transaction running. We wait for any running |
| 3210 | * trasnaction to commit. | 3210 | * transaction to commit. |
| 3211 | * | 3211 | * |
| 3212 | * - Within sys_sync(), kupdate and such. | 3212 | * - Within sys_sync(), kupdate and such. |
| 3213 | * We wait on commit, if tol to. | 3213 | * We wait on commit, if tol to. |