aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs/file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-03 16:23:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-03 16:23:03 -0500
commit56a79b7b021bf1b08334e63c2c14b280e2dbf47a (patch)
tree0419233e6194f4f12073c9284852885aa8984bec /fs/f2fs/file.c
parent1c82315a12144cde732636e259d39e3ee81b3c5b (diff)
parentdcf787f39162ce32ca325b3e784aba2d2444619a (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull more VFS bits from Al Viro: "Unfortunately, it looks like xattr series will have to wait until the next cycle ;-/ This pile contains 9p cleanups and fixes (races in v9fs_fid_add() etc), fixup for nommu breakage in shmem.c, several cleanups and a bit more file_inode() work" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: constify path_get/path_put and fs_struct.c stuff fix nommu breakage in shmem.c cache the value of file_inode() in struct file 9p: if v9fs_fid_lookup() gets to asking server, it'd better have hashed dentry 9p: make sure ->lookup() adds fid to the right dentry 9p: untangle ->lookup() a bit 9p: double iput() in ->lookup() if d_materialise_unique() fails 9p: v9fs_fid_add() can't fail now v9fs: get rid of v9fs_dentry 9p: turn fid->dlist into hlist 9p: don't bother with private lock in ->d_fsdata; dentry->d_lock will do just fine more file_inode() open-coded instances selinux: opened file can't have NULL or negative ->f_path.dentry (In the meantime, the hlist traversal macros have changed, so this required a semantic conflict fixup for the newly hlistified fid->dlist)
Diffstat (limited to 'fs/f2fs/file.c')
-rw-r--r--fs/f2fs/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index b7a053d4c6d3..958a46da19ae 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -29,7 +29,7 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
29 struct vm_fault *vmf) 29 struct vm_fault *vmf)
30{ 30{
31 struct page *page = vmf->page; 31 struct page *page = vmf->page;
32 struct inode *inode = vma->vm_file->f_path.dentry->d_inode; 32 struct inode *inode = file_inode(vma->vm_file);
33 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); 33 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
34 block_t old_blk_addr; 34 block_t old_blk_addr;
35 struct dnode_of_data dn; 35 struct dnode_of_data dn;
@@ -544,7 +544,7 @@ static int expand_inode_data(struct inode *inode, loff_t offset,
544static long f2fs_fallocate(struct file *file, int mode, 544static long f2fs_fallocate(struct file *file, int mode,
545 loff_t offset, loff_t len) 545 loff_t offset, loff_t len)
546{ 546{
547 struct inode *inode = file->f_path.dentry->d_inode; 547 struct inode *inode = file_inode(file);
548 long ret; 548 long ret;
549 549
550 if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) 550 if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE))
@@ -577,7 +577,7 @@ static inline __u32 f2fs_mask_flags(umode_t mode, __u32 flags)
577 577
578long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 578long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
579{ 579{
580 struct inode *inode = filp->f_dentry->d_inode; 580 struct inode *inode = file_inode(filp);
581 struct f2fs_inode_info *fi = F2FS_I(inode); 581 struct f2fs_inode_info *fi = F2FS_I(inode);
582 unsigned int flags; 582 unsigned int flags;
583 int ret; 583 int ret;