diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 01:34:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 01:34:57 +0100 |
| commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
| tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /fs/reiserfs/xattr.c | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| parent | Documentation/filesystems/00-INDEX: remove entry for fat_cvf.txt (diff) | |
| download | linux-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.tar.xz linux-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'fs/reiserfs/xattr.c')
| -rw-r--r-- | fs/reiserfs/xattr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 72e120798677..02091eaac0b4 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -115,8 +115,8 @@ static struct dentry *__get_xa_root(struct super_block *s) } /* Returns the dentry (or NULL) referring to the root of the extended - * attribute directory tree. If it has already been retreived, it is used. - * Otherwise, we attempt to retreive it from disk. It may also return + * attribute directory tree. If it has already been retrieved, it is used. + * Otherwise, we attempt to retrieve it from disk. It may also return * a pointer-encoded error. */ static inline struct dentry *get_xa_root(struct super_block *s) |