diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
| commit | 69a7aebcf019ab3ff5764525ad6858fbe23bb86d (patch) | |
| tree | 7211df5704b743a7667159748c670a9744164482 /fs/ntfs | |
| parent | d464c92b5234227c1698862a1906827e2e398ae0 (diff) | |
| parent | f1f996b66cc3908a8f5ffccc2ff41840e92f3b10 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"It's indeed trivial -- mostly documentation updates and a bunch of
typo fixes from Masanari.
There are also several linux/version.h include removals from Jesper."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
kcore: fix spelling in read_kcore() comment
constify struct pci_dev * in obvious cases
Revert "char: Fix typo in viotape.c"
init: fix wording error in mm_init comment
usb: gadget: Kconfig: fix typo for 'different'
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
writeback: fix typo in the writeback_control comment
Documentation: Fix multiple typo in Documentation
tpm_tis: fix tis_lock with respect to RCU
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
Doc: Update numastat.txt
qla4xxx: Add missing spaces to error messages
compiler.h: Fix typo
security: struct security_operations kerneldoc fix
Documentation: broken URL in libata.tmpl
Documentation: broken URL in filesystems.tmpl
mtd: simplify return logic in do_map_probe()
mm: fix comment typo of truncate_inode_pages_range
power: bq27x00: Fix typos in comment
...
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/layout.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h index faece7190866..809c0e6d8e09 100644 --- a/fs/ntfs/layout.h +++ b/fs/ntfs/layout.h | |||
| @@ -2008,14 +2008,14 @@ typedef struct { | |||
| 2008 | * | 2008 | * |
| 2009 | * When a directory is small enough to fit inside the index root then this | 2009 | * When a directory is small enough to fit inside the index root then this |
| 2010 | * is the only attribute describing the directory. When the directory is too | 2010 | * is the only attribute describing the directory. When the directory is too |
| 2011 | * large to fit in the index root, on the other hand, two aditional attributes | 2011 | * large to fit in the index root, on the other hand, two additional attributes |
| 2012 | * are present: an index allocation attribute, containing sub-nodes of the B+ | 2012 | * are present: an index allocation attribute, containing sub-nodes of the B+ |
| 2013 | * directory tree (see below), and a bitmap attribute, describing which virtual | 2013 | * directory tree (see below), and a bitmap attribute, describing which virtual |
| 2014 | * cluster numbers (vcns) in the index allocation attribute are in use by an | 2014 | * cluster numbers (vcns) in the index allocation attribute are in use by an |
| 2015 | * index block. | 2015 | * index block. |
| 2016 | * | 2016 | * |
| 2017 | * NOTE: The root directory (FILE_root) contains an entry for itself. Other | 2017 | * NOTE: The root directory (FILE_root) contains an entry for itself. Other |
| 2018 | * dircetories do not contain entries for themselves, though. | 2018 | * directories do not contain entries for themselves, though. |
| 2019 | */ | 2019 | */ |
| 2020 | typedef struct { | 2020 | typedef struct { |
| 2021 | ATTR_TYPE type; /* Type of the indexed attribute. Is | 2021 | ATTR_TYPE type; /* Type of the indexed attribute. Is |