diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-02 11:29:07 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-02 11:29:07 +0000 |
commit | 692d96aa22dea8bb80018c6a76556ad6afd464a6 (patch) | |
tree | e8dd55655fa001e53058c5264d541f8b3d3c1a7b /fs/stat.c | |
parent | 1874098820e8269fe88d67bc08c908134dd87102 (diff) | |
parent | 4227cffc1f9e4a9241071354476c225705b614c8 (diff) |
Merge tag 'v3.10.67' into linux-linaro-lsk
This is the 3.10.67 stable release
Diffstat (limited to 'fs/stat.c')
-rw-r--r-- | fs/stat.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/stat.c b/fs/stat.c index 04ce1ac20d20..d0ea7ef75e26 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -447,9 +447,8 @@ void inode_add_bytes(struct inode *inode, loff_t bytes) EXPORT_SYMBOL(inode_add_bytes); -void inode_sub_bytes(struct inode *inode, loff_t bytes) +void __inode_sub_bytes(struct inode *inode, loff_t bytes) { - spin_lock(&inode->i_lock); inode->i_blocks -= bytes >> 9; bytes &= 511; if (inode->i_bytes < bytes) { @@ -457,6 +456,14 @@ void inode_sub_bytes(struct inode *inode, loff_t bytes) inode->i_bytes += 512; } inode->i_bytes -= bytes; +} + +EXPORT_SYMBOL(__inode_sub_bytes); + +void inode_sub_bytes(struct inode *inode, loff_t bytes) +{ + spin_lock(&inode->i_lock); + __inode_sub_bytes(inode, bytes); spin_unlock(&inode->i_lock); } |