mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
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 <[email protected]> Reviewed-by: Amir Goldstein <[email protected]> Acked-by: Mimi Zohar <[email protected]> (Changes to IMA/EVM) Reviewed-by: Andy Shevchenko <[email protected]>
This commit is contained in:
parent
787d8c530a
commit
85787090a2
14 changed files with 23 additions and 36 deletions
|
|
@ -284,7 +284,6 @@ static int ovl_set_origin(struct dentry *dentry, struct dentry *lower,
|
|||
struct dentry *upper)
|
||||
{
|
||||
struct super_block *sb = lower->d_sb;
|
||||
uuid_be *uuid = (uuid_be *) &sb->s_uuid;
|
||||
const struct ovl_fh *fh = NULL;
|
||||
int err;
|
||||
|
||||
|
|
@ -294,8 +293,8 @@ static int ovl_set_origin(struct dentry *dentry, struct dentry *lower,
|
|||
* up and a pure upper inode.
|
||||
*/
|
||||
if (sb->s_export_op && sb->s_export_op->fh_to_dentry &&
|
||||
uuid_be_cmp(*uuid, NULL_UUID_BE)) {
|
||||
fh = ovl_encode_fh(lower, uuid);
|
||||
!uuid_is_null(&sb->s_uuid)) {
|
||||
fh = ovl_encode_fh(lower, &sb->s_uuid);
|
||||
if (IS_ERR(fh))
|
||||
return PTR_ERR(fh);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ static struct dentry *ovl_get_origin(struct dentry *dentry,
|
|||
* Make sure that the stored uuid matches the uuid of the lower
|
||||
* layer where file handle will be decoded.
|
||||
*/
|
||||
if (uuid_be_cmp(fh->uuid, *(uuid_be *) &mnt->mnt_sb->s_uuid))
|
||||
if (!uuid_equal(&fh->uuid, &mnt->mnt_sb->s_uuid))
|
||||
goto out;
|
||||
|
||||
origin = exportfs_decode_fh(mnt, (struct fid *)fh->fid,
|
||||
|
|
|
|||
Loading…
Reference in a new issue