diff options
author | Erez Zadok <ezk@cs.sunysb.edu> | 2009-12-03 21:56:09 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-17 10:58:17 -0500 |
commit | 1b8ab8159ef8f818f870a1d2e3b6953d80eefd3f (patch) | |
tree | 97fdfc87493d5077c4c510e4defedccc483477af /fs | |
parent | 9afa2fb6c13501e5b3536d15344fce4e5442c469 (diff) |
VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_copy_inode_size
Copy the inode size and blocks from one inode to another correctly on 32-bit
systems with CONFIG_SMP, CONFIG_PREEMPT, or CONFIG_LBDAF. Use proper inode
spinlocks only when i_size/i_blocks cannot fit in one 32-bit word.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/stack.c | 54 |
1 files changed, 51 insertions, 3 deletions
diff --git a/fs/stack.c b/fs/stack.c index 0e20e43ad740..4a6f7f440658 100644 --- a/fs/stack.c +++ b/fs/stack.c | |||
@@ -7,10 +7,58 @@ | |||
7 | * This function cannot be inlined since i_size_{read,write} is rather | 7 | * This function cannot be inlined since i_size_{read,write} is rather |
8 | * heavy-weight on 32-bit systems | 8 | * heavy-weight on 32-bit systems |
9 | */ | 9 | */ |
10 | void fsstack_copy_inode_size(struct inode *dst, const struct inode *src) | 10 | void fsstack_copy_inode_size(struct inode *dst, struct inode *src) |
11 | { | 11 | { |
12 | i_size_write(dst, i_size_read((struct inode *)src)); | 12 | loff_t i_size; |
13 | dst->i_blocks = src->i_blocks; | 13 | blkcnt_t i_blocks; |
14 | |||
15 | /* | ||
16 | * i_size_read() includes its own seqlocking and protection from | ||
17 | * preemption (see include/linux/fs.h): we need nothing extra for | ||
18 | * that here, and prefer to avoid nesting locks than attempt to keep | ||
19 | * i_size and i_blocks in sync together. | ||
20 | */ | ||
21 | i_size = i_size_read(src); | ||
22 | |||
23 | /* | ||
24 | * But if CONFIG_LBDAF (on 32-bit), we ought to make an effort to | ||
25 | * keep the two halves of i_blocks in sync despite SMP or PREEMPT - | ||
26 | * though stat's generic_fillattr() doesn't bother, and we won't be | ||
27 | * applying quotas (where i_blocks does become important) at the | ||
28 | * upper level. | ||
29 | * | ||
30 | * We don't actually know what locking is used at the lower level; | ||
31 | * but if it's a filesystem that supports quotas, it will be using | ||
32 | * i_lock as in inode_add_bytes(). tmpfs uses other locking, and | ||
33 | * its 32-bit is (just) able to exceed 2TB i_size with the aid of | ||
34 | * holes; but its i_blocks cannot carry into the upper long without | ||
35 | * almost 2TB swap - let's ignore that case. | ||
36 | */ | ||
37 | if (sizeof(i_blocks) > sizeof(long)) | ||
38 | spin_lock(&src->i_lock); | ||
39 | i_blocks = src->i_blocks; | ||
40 | if (sizeof(i_blocks) > sizeof(long)) | ||
41 | spin_unlock(&src->i_lock); | ||
42 | |||
43 | /* | ||
44 | * If CONFIG_SMP or CONFIG_PREEMPT on 32-bit, it's vital for | ||
45 | * fsstack_copy_inode_size() to hold some lock around | ||
46 | * i_size_write(), otherwise i_size_read() may spin forever (see | ||
47 | * include/linux/fs.h). We don't necessarily hold i_mutex when this | ||
48 | * is called, so take i_lock for that case. | ||
49 | * | ||
50 | * And if CONFIG_LBADF (on 32-bit), continue our effort to keep the | ||
51 | * two halves of i_blocks in sync despite SMP or PREEMPT: use i_lock | ||
52 | * for that case too, and do both at once by combining the tests. | ||
53 | * | ||
54 | * There is none of this locking overhead in the 64-bit case. | ||
55 | */ | ||
56 | if (sizeof(i_size) > sizeof(long) || sizeof(i_blocks) > sizeof(long)) | ||
57 | spin_lock(&dst->i_lock); | ||
58 | i_size_write(dst, i_size); | ||
59 | dst->i_blocks = i_blocks; | ||
60 | if (sizeof(i_size) > sizeof(long) || sizeof(i_blocks) > sizeof(long)) | ||
61 | spin_unlock(&dst->i_lock); | ||
14 | } | 62 | } |
15 | EXPORT_SYMBOL_GPL(fsstack_copy_inode_size); | 63 | EXPORT_SYMBOL_GPL(fsstack_copy_inode_size); |
16 | 64 | ||