diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-20 04:26:44 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 04:26:44 +0000 |
| commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
| tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /fs/ocfs2 | |
| parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
| parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
| download | kernel_samsung_crespo-748c5151deb56e4b7b5a9b07a884243764933831.zip kernel_samsung_crespo-748c5151deb56e4b7b5a9b07a884243764933831.tar.gz kernel_samsung_crespo-748c5151deb56e4b7b5a9b07a884243764933831.tar.bz2 | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/dcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c index 014e739..3094ddb 100644 --- a/fs/ocfs2/dcache.c +++ b/fs/ocfs2/dcache.c @@ -376,7 +376,7 @@ out: * directory locks. The dentries have already been deleted on other * nodes via ocfs2_remote_dentry_delete(). * - * Normally, the VFS handles the d_move() for the file sytem, after + * Normally, the VFS handles the d_move() for the file system, after * the ->rename() callback. OCFS2 wants to handle this internally, so * the new lock can be created atomically with respect to the cluster. */ |