diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-11-17 10:20:54 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-08 22:41:54 -0500 |
commit | 6b2553918d8b4e6de9853fd6315bec7271a2e592 (patch) | |
tree | 85540dcb0dc0de3d67c68d0aa7b17058f4e96539 /fs/overlayfs | |
parent | 21fc61c73c3903c4c312d0802da01ec2b323d174 (diff) |
replace ->follow_link() with new method that could stay in RCU mode
new method: ->get_link(); replacement of ->follow_link(). The differences
are:
* inode and dentry are passed separately
* might be called both in RCU and non-RCU mode;
the former is indicated by passing it a NULL dentry.
* when called that way it isn't allowed to block
and should return ERR_PTR(-ECHILD) if it needs to be called
in non-RCU mode.
It's a flagday change - the old method is gone, all in-tree instances
converted. Conversion isn't hard; said that, so far very few instances
do not immediately bail out when called in RCU mode. That'll change
in the next commits.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/overlayfs')
-rw-r--r-- | fs/overlayfs/inode.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index 4060ffde8722..38a0b8b9f8b9 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c | |||
@@ -137,17 +137,21 @@ struct ovl_link_data { | |||
137 | void *cookie; | 137 | void *cookie; |
138 | }; | 138 | }; |
139 | 139 | ||
140 | static const char *ovl_follow_link(struct dentry *dentry, void **cookie) | 140 | static const char *ovl_get_link(struct dentry *dentry, |
141 | struct inode *inode, void **cookie) | ||
141 | { | 142 | { |
142 | struct dentry *realdentry; | 143 | struct dentry *realdentry; |
143 | struct inode *realinode; | 144 | struct inode *realinode; |
144 | struct ovl_link_data *data = NULL; | 145 | struct ovl_link_data *data = NULL; |
145 | const char *ret; | 146 | const char *ret; |
146 | 147 | ||
148 | if (!dentry) | ||
149 | return ERR_PTR(-ECHILD); | ||
150 | |||
147 | realdentry = ovl_dentry_real(dentry); | 151 | realdentry = ovl_dentry_real(dentry); |
148 | realinode = realdentry->d_inode; | 152 | realinode = realdentry->d_inode; |
149 | 153 | ||
150 | if (WARN_ON(!realinode->i_op->follow_link)) | 154 | if (WARN_ON(!realinode->i_op->get_link)) |
151 | return ERR_PTR(-EPERM); | 155 | return ERR_PTR(-EPERM); |
152 | 156 | ||
153 | if (realinode->i_op->put_link) { | 157 | if (realinode->i_op->put_link) { |
@@ -157,7 +161,7 @@ static const char *ovl_follow_link(struct dentry *dentry, void **cookie) | |||
157 | data->realdentry = realdentry; | 161 | data->realdentry = realdentry; |
158 | } | 162 | } |
159 | 163 | ||
160 | ret = realinode->i_op->follow_link(realdentry, cookie); | 164 | ret = realinode->i_op->get_link(realdentry, realinode, cookie); |
161 | if (IS_ERR_OR_NULL(ret)) { | 165 | if (IS_ERR_OR_NULL(ret)) { |
162 | kfree(data); | 166 | kfree(data); |
163 | return ret; | 167 | return ret; |
@@ -378,7 +382,7 @@ static const struct inode_operations ovl_file_inode_operations = { | |||
378 | 382 | ||
379 | static const struct inode_operations ovl_symlink_inode_operations = { | 383 | static const struct inode_operations ovl_symlink_inode_operations = { |
380 | .setattr = ovl_setattr, | 384 | .setattr = ovl_setattr, |
381 | .follow_link = ovl_follow_link, | 385 | .get_link = ovl_get_link, |
382 | .put_link = ovl_put_link, | 386 | .put_link = ovl_put_link, |
383 | .readlink = ovl_readlink, | 387 | .readlink = ovl_readlink, |
384 | .getattr = ovl_getattr, | 388 | .getattr = ovl_getattr, |