namei.c (304eecc3462ed62006433d04e3ad945f92f90d52) | namei.c (26bf3dc7e25b813ff5c92234f8165941fdc12a63) |
---|---|
1/* 2 * fs/f2fs/namei.c 3 * 4 * Copyright (c) 2012 Samsung Electronics Co., Ltd. 5 * http://www.samsung.com/ 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License version 2 as --- 350 unchanged lines hidden (view full) --- 359 360 if (f2fs_encrypted_inode(dir)) { 361 struct qstr istr = QSTR_INIT(symname, len); 362 363 err = f2fs_inherit_context(dir, inode, NULL); 364 if (err) 365 goto err_out; 366 | 1/* 2 * fs/f2fs/namei.c 3 * 4 * Copyright (c) 2012 Samsung Electronics Co., Ltd. 5 * http://www.samsung.com/ 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License version 2 as --- 350 unchanged lines hidden (view full) --- 359 360 if (f2fs_encrypted_inode(dir)) { 361 struct qstr istr = QSTR_INIT(symname, len); 362 363 err = f2fs_inherit_context(dir, inode, NULL); 364 if (err) 365 goto err_out; 366 |
367 err = f2fs_setup_fname_crypto(inode); | 367 err = f2fs_get_encryption_info(inode); |
368 if (err) 369 goto err_out; 370 371 err = f2fs_fname_crypto_alloc_buffer(inode, len, &disk_link); 372 if (err) 373 goto err_out; 374 375 err = f2fs_fname_usr_to_disk(inode, &istr, &disk_link); --- 548 unchanged lines hidden (view full) --- 924 struct f2fs_str cstr; 925 struct f2fs_str pstr = FSTR_INIT(NULL, 0); 926 struct inode *inode = d_inode(dentry); 927 struct f2fs_encrypted_symlink_data *sd; 928 loff_t size = min_t(loff_t, i_size_read(inode), PAGE_SIZE - 1); 929 u32 max_size = inode->i_sb->s_blocksize; 930 int res; 931 | 368 if (err) 369 goto err_out; 370 371 err = f2fs_fname_crypto_alloc_buffer(inode, len, &disk_link); 372 if (err) 373 goto err_out; 374 375 err = f2fs_fname_usr_to_disk(inode, &istr, &disk_link); --- 548 unchanged lines hidden (view full) --- 924 struct f2fs_str cstr; 925 struct f2fs_str pstr = FSTR_INIT(NULL, 0); 926 struct inode *inode = d_inode(dentry); 927 struct f2fs_encrypted_symlink_data *sd; 928 loff_t size = min_t(loff_t, i_size_read(inode), PAGE_SIZE - 1); 929 u32 max_size = inode->i_sb->s_blocksize; 930 int res; 931 |
932 res = f2fs_setup_fname_crypto(inode); | 932 res = f2fs_get_encryption_info(inode); |
933 if (res) 934 return ERR_PTR(res); 935 936 cpage = read_mapping_page(inode->i_mapping, 0, NULL); 937 if (IS_ERR(cpage)) 938 return cpage; 939 caddr = kmap(cpage); 940 caddr[size] = 0; --- 104 unchanged lines hidden --- | 933 if (res) 934 return ERR_PTR(res); 935 936 cpage = read_mapping_page(inode->i_mapping, 0, NULL); 937 if (IS_ERR(cpage)) 938 return cpage; 939 caddr = kmap(cpage); 940 caddr[size] = 0; --- 104 unchanged lines hidden --- |