aboutsummaryrefslogtreecommitdiffstats
path: root/fs/overlayfs/copy_up.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-05-10 09:06:33 -0400
committerChristoph Hellwig <hch@lst.de>2017-06-05 10:59:12 -0400
commit85787090a21eb749d8b347eaf9ff1a455637473c (patch)
tree25f85517eb05e430352aff20e571fb604ec6abd1 /fs/overlayfs/copy_up.c
parent787d8c530af73257240fc0c0f60e296a83d5e5f4 (diff)
fs: switch ->s_uuid to uuid_t
For some file systems we still memcpy into it, but in various places this already allows us to use the proper uuid helpers. More to come.. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Amir Goldstein <amir73il@gmail.com> Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com> (Changes to IMA/EVM) Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'fs/overlayfs/copy_up.c')
-rw-r--r--fs/overlayfs/copy_up.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 7a44533f4bbf..d55fceb4e414 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -284,7 +284,6 @@ static int ovl_set_origin(struct dentry *dentry, struct dentry *lower,
284 struct dentry *upper) 284 struct dentry *upper)
285{ 285{
286 struct super_block *sb = lower->d_sb; 286 struct super_block *sb = lower->d_sb;
287 uuid_be *uuid = (uuid_be *) &sb->s_uuid;
288 const struct ovl_fh *fh = NULL; 287 const struct ovl_fh *fh = NULL;
289 int err; 288 int err;
290 289
@@ -294,8 +293,8 @@ static int ovl_set_origin(struct dentry *dentry, struct dentry *lower,
294 * up and a pure upper inode. 293 * up and a pure upper inode.
295 */ 294 */
296 if (sb->s_export_op && sb->s_export_op->fh_to_dentry && 295 if (sb->s_export_op && sb->s_export_op->fh_to_dentry &&
297 uuid_be_cmp(*uuid, NULL_UUID_BE)) { 296 !uuid_is_null(&sb->s_uuid)) {
298 fh = ovl_encode_fh(lower, uuid); 297 fh = ovl_encode_fh(lower, &sb->s_uuid);
299 if (IS_ERR(fh)) 298 if (IS_ERR(fh))
300 return PTR_ERR(fh); 299 return PTR_ERR(fh);
301 } 300 }