aboutsummaryrefslogtreecommitdiffstats
path: root/fs/stack.c
diff options
context:
space:
mode:
authorErez Zadok <ezk@cs.sunysb.edu>2007-02-18 23:57:45 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 14:21:50 -0800
commita6e6df25ec6751f4f73784398ab7d43cf9d2019f (patch)
tree64c2862e00a9094d5ace11b812fcf0ac506df945 /fs/stack.c
parentbc5393a6c9c0e70b4b43fb2fb63e3315e9a15c8f (diff)
downloadmrst-s0i3-test-a6e6df25ec6751f4f73784398ab7d43cf9d2019f.tar.gz
mrst-s0i3-test-a6e6df25ec6751f4f73784398ab7d43cf9d2019f.tar.xz
mrst-s0i3-test-a6e6df25ec6751f4f73784398ab7d43cf9d2019f.zip
[PATCH] fs/stack.c: Copy i_nlink after all other attributes are copied
A user-specified get_nlinks may depend on other inode attributes. Cc: Michael Halcrow <mhalcrow@us.ibm.com> Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/stack.c')
-rw-r--r--fs/stack.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/fs/stack.c b/fs/stack.c
index 8ffb880d2f4..67716f6a1a4 100644
--- a/fs/stack.c
+++ b/fs/stack.c
@@ -20,11 +20,6 @@ EXPORT_SYMBOL_GPL(fsstack_copy_inode_size);
void fsstack_copy_attr_all(struct inode *dest, const struct inode *src,
int (*get_nlinks)(struct inode *))
{
- if (!get_nlinks)
- dest->i_nlink = src->i_nlink;
- else
- dest->i_nlink = (*get_nlinks)(dest);
-
dest->i_mode = src->i_mode;
dest->i_uid = src->i_uid;
dest->i_gid = src->i_gid;
@@ -34,5 +29,14 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src,
dest->i_ctime = src->i_ctime;
dest->i_blkbits = src->i_blkbits;
dest->i_flags = src->i_flags;
+
+ /*
+ * Update the nlinks AFTER updating the above fields, because the
+ * get_links callback may depend on them.
+ */
+ if (!get_nlinks)
+ dest->i_nlink = src->i_nlink;
+ else
+ dest->i_nlink = (*get_nlinks)(dest);
}
EXPORT_SYMBOL_GPL(fsstack_copy_attr_all);