09cbfeaf1a
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
123 lines
3 KiB
C
123 lines
3 KiB
C
/*
|
|
* linux/fs/ext4/symlink.c
|
|
*
|
|
* Only fast symlinks left here - the rest is done by generic code. AV, 1999
|
|
*
|
|
* Copyright (C) 1992, 1993, 1994, 1995
|
|
* Remy Card (card@masi.ibp.fr)
|
|
* Laboratoire MASI - Institut Blaise Pascal
|
|
* Universite Pierre et Marie Curie (Paris VI)
|
|
*
|
|
* from
|
|
*
|
|
* linux/fs/minix/symlink.c
|
|
*
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
*
|
|
* ext4 symlink handling code
|
|
*/
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/namei.h>
|
|
#include "ext4.h"
|
|
#include "xattr.h"
|
|
|
|
#ifdef CONFIG_EXT4_FS_ENCRYPTION
|
|
static const char *ext4_encrypted_get_link(struct dentry *dentry,
|
|
struct inode *inode,
|
|
struct delayed_call *done)
|
|
{
|
|
struct page *cpage = NULL;
|
|
char *caddr, *paddr = NULL;
|
|
struct ext4_str cstr, pstr;
|
|
struct ext4_encrypted_symlink_data *sd;
|
|
loff_t size = min_t(loff_t, i_size_read(inode), PAGE_SIZE - 1);
|
|
int res;
|
|
u32 plen, max_size = inode->i_sb->s_blocksize;
|
|
|
|
if (!dentry)
|
|
return ERR_PTR(-ECHILD);
|
|
|
|
res = ext4_get_encryption_info(inode);
|
|
if (res)
|
|
return ERR_PTR(res);
|
|
|
|
if (ext4_inode_is_fast_symlink(inode)) {
|
|
caddr = (char *) EXT4_I(inode)->i_data;
|
|
max_size = sizeof(EXT4_I(inode)->i_data);
|
|
} else {
|
|
cpage = read_mapping_page(inode->i_mapping, 0, NULL);
|
|
if (IS_ERR(cpage))
|
|
return ERR_CAST(cpage);
|
|
caddr = page_address(cpage);
|
|
caddr[size] = 0;
|
|
}
|
|
|
|
/* Symlink is encrypted */
|
|
sd = (struct ext4_encrypted_symlink_data *)caddr;
|
|
cstr.name = sd->encrypted_path;
|
|
cstr.len = le16_to_cpu(sd->len);
|
|
if ((cstr.len +
|
|
sizeof(struct ext4_encrypted_symlink_data) - 1) >
|
|
max_size) {
|
|
/* Symlink data on the disk is corrupted */
|
|
res = -EFSCORRUPTED;
|
|
goto errout;
|
|
}
|
|
plen = (cstr.len < EXT4_FNAME_CRYPTO_DIGEST_SIZE*2) ?
|
|
EXT4_FNAME_CRYPTO_DIGEST_SIZE*2 : cstr.len;
|
|
paddr = kmalloc(plen + 1, GFP_NOFS);
|
|
if (!paddr) {
|
|
res = -ENOMEM;
|
|
goto errout;
|
|
}
|
|
pstr.name = paddr;
|
|
pstr.len = plen;
|
|
res = _ext4_fname_disk_to_usr(inode, NULL, &cstr, &pstr);
|
|
if (res < 0)
|
|
goto errout;
|
|
/* Null-terminate the name */
|
|
if (res <= plen)
|
|
paddr[res] = '\0';
|
|
if (cpage)
|
|
put_page(cpage);
|
|
set_delayed_call(done, kfree_link, paddr);
|
|
return paddr;
|
|
errout:
|
|
if (cpage)
|
|
put_page(cpage);
|
|
kfree(paddr);
|
|
return ERR_PTR(res);
|
|
}
|
|
|
|
const struct inode_operations ext4_encrypted_symlink_inode_operations = {
|
|
.readlink = generic_readlink,
|
|
.get_link = ext4_encrypted_get_link,
|
|
.setattr = ext4_setattr,
|
|
.setxattr = generic_setxattr,
|
|
.getxattr = generic_getxattr,
|
|
.listxattr = ext4_listxattr,
|
|
.removexattr = generic_removexattr,
|
|
};
|
|
#endif
|
|
|
|
const struct inode_operations ext4_symlink_inode_operations = {
|
|
.readlink = generic_readlink,
|
|
.get_link = page_get_link,
|
|
.setattr = ext4_setattr,
|
|
.setxattr = generic_setxattr,
|
|
.getxattr = generic_getxattr,
|
|
.listxattr = ext4_listxattr,
|
|
.removexattr = generic_removexattr,
|
|
};
|
|
|
|
const struct inode_operations ext4_fast_symlink_inode_operations = {
|
|
.readlink = generic_readlink,
|
|
.get_link = simple_get_link,
|
|
.setattr = ext4_setattr,
|
|
.setxattr = generic_setxattr,
|
|
.getxattr = generic_getxattr,
|
|
.listxattr = ext4_listxattr,
|
|
.removexattr = generic_removexattr,
|
|
};
|