new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
12
mm/shmem.c
12
mm/shmem.c
@@ -1295,7 +1295,7 @@ unlock:
|
||||
|
||||
static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
||||
{
|
||||
struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(vma->vm_file);
|
||||
int error;
|
||||
int ret = VM_FAULT_LOCKED;
|
||||
|
||||
@@ -1313,14 +1313,14 @@ static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
||||
#ifdef CONFIG_NUMA
|
||||
static int shmem_set_policy(struct vm_area_struct *vma, struct mempolicy *mpol)
|
||||
{
|
||||
struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(vma->vm_file);
|
||||
return mpol_set_shared_policy(&SHMEM_I(inode)->policy, vma, mpol);
|
||||
}
|
||||
|
||||
static struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
|
||||
unsigned long addr)
|
||||
{
|
||||
struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(vma->vm_file);
|
||||
pgoff_t index;
|
||||
|
||||
index = ((addr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
|
||||
@@ -1330,7 +1330,7 @@ static struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
|
||||
|
||||
int shmem_lock(struct file *file, int lock, struct user_struct *user)
|
||||
{
|
||||
struct inode *inode = file->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(file);
|
||||
struct shmem_inode_info *info = SHMEM_I(inode);
|
||||
int retval = -ENOMEM;
|
||||
|
||||
@@ -1465,7 +1465,7 @@ shmem_write_end(struct file *file, struct address_space *mapping,
|
||||
|
||||
static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc, read_actor_t actor)
|
||||
{
|
||||
struct inode *inode = filp->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(filp);
|
||||
struct address_space *mapping = inode->i_mapping;
|
||||
pgoff_t index;
|
||||
unsigned long offset;
|
||||
@@ -1808,7 +1808,7 @@ static loff_t shmem_file_llseek(struct file *file, loff_t offset, int whence)
|
||||
static long shmem_fallocate(struct file *file, int mode, loff_t offset,
|
||||
loff_t len)
|
||||
{
|
||||
struct inode *inode = file->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(file);
|
||||
struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb);
|
||||
struct shmem_falloc shmem_falloc;
|
||||
pgoff_t start, index, end;
|
||||
|
Reference in New Issue
Block a user