diff options
author | James Morris <jmorris@namei.org> | 2011-04-19 21:32:41 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-04-19 21:32:41 +1000 |
commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /fs/logfs/readwrite.c | |
parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
download | linux-stable-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.tar.gz linux-stable-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.tar.bz2 linux-stable-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.zip |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'fs/logfs/readwrite.c')
-rw-r--r-- | fs/logfs/readwrite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c index ee99a9f5dfd3..9e22085231b3 100644 --- a/fs/logfs/readwrite.c +++ b/fs/logfs/readwrite.c @@ -1616,7 +1616,7 @@ int logfs_rewrite_block(struct inode *inode, u64 bix, u64 ofs, err = logfs_write_buf(inode, page, flags); if (!err && shrink_level(gc_level) == 0) { /* Rewrite cannot mark the inode dirty but has to - * write it immediatly. + * write it immediately. * Q: Can't we just create an alias for the inode * instead? And if not, why not? */ |