Merge branches 'clk-samsung', 'clk-formatting', 'clk-si5341' and 'clk-socfpga' into...

[linux-2.6-microblaze.git] / fs / stack.c

diff --git a/fs/stack.c b/fs/stack.c
index 4ef2c05..c983092 100644 (file)
--- a/fs/stack.c
+++ b/fs/stack.c
@@ -23,7 +23,7 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src)
 
        /*
         * But on 32-bit, we ought to make an effort to keep the two halves of
-        * i_blocks in sync despite SMP or PREEMPT - though stat's
+        * i_blocks in sync despite SMP or PREEMPTION - though stat's
         * generic_fillattr() doesn't bother, and we won't be applying quotas
         * (where i_blocks does become important) at the upper level.
         *
@@ -38,14 +38,14 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src)
                spin_unlock(&src->i_lock);
 
        /*
-        * If CONFIG_SMP or CONFIG_PREEMPT on 32-bit, it's vital for
+        * If CONFIG_SMP or CONFIG_PREEMPTION on 32-bit, it's vital for
         * fsstack_copy_inode_size() to hold some lock around
         * i_size_write(), otherwise i_size_read() may spin forever (see
         * include/linux/fs.h).  We don't necessarily hold i_mutex when this
         * is called, so take i_lock for that case.
         *
         * And if on 32-bit, continue our effort to keep the two halves of
-        * i_blocks in sync despite SMP or PREEMPT: use i_lock  for that case
+        * i_blocks in sync despite SMP or PREEMPTION: use i_lock for that case
         * too, and do both at once by combining the tests.
         *
         * There is none of this locking overhead in the 64-bit case.