diff options
author | Mark Brown | 2011-04-18 18:12:14 +0200 |
---|---|---|
committer | Mark Brown | 2011-04-18 18:12:14 +0200 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /fs/ocfs2/namei.c | |
parent | ARM: s3c2440: gta02; Register dfbmcs320 device for BT audio interface (diff) | |
parent | Linux 2.6.39-rc3 (diff) | |
download | kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.gz kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.xz kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.zip |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'fs/ocfs2/namei.c')
-rw-r--r-- | fs/ocfs2/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 28f2cc1080d8..e5d738cd9cc0 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -2128,7 +2128,7 @@ leave: } /** - * ocfs2_prep_new_orphaned_file() - Prepare the orphan dir to recieve a newly + * ocfs2_prep_new_orphaned_file() - Prepare the orphan dir to receive a newly * allocated file. This is different from the typical 'add to orphan dir' * operation in that the inode does not yet exist. This is a problem because * the orphan dir stringifies the inode block number to come up with it's |