History

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)

Linus Torvalds committed 13 years ago

Commit 56a79b72 parents 1c82315 dcf787f26 files · +108 −171Browse files

Unified · Split

26 files
  1. arch/s390/hypfs/inode.c +2 −4
  2. arch/x86/kernel/msr.c +4 −5
  3. drivers/staging/comedi/comedi_fops.c +7 −7
  4. drivers/tty/tty_io.c +6 −10
  5. fs/9p/fid.c +25 −29
  6. fs/9p/fid.h +1 −21
  7. fs/9p/vfs_dentry.c +4 −13
  8. fs/9p/vfs_inode.c +14 −26
  9. fs/9p/vfs_inode_dotl.c +7 −12
  10. fs/ext4/indirect.c +1 −1
  11. fs/f2fs/file.c +3 −3
  12. fs/file_table.c +2 −0
  13. fs/fs_struct.c +3 −3
  14. fs/fuse/dev.c +1 −1
  15. fs/fuse/file.c +12 −12
  16. fs/internal.h +1 −1
  17. fs/namei.c +2 −2
  18. fs/open.c +2 −1
  19. fs/seq_file.c +1 −1
  20. include/linux/fs.h +2 −1
  21. include/linux/fs_struct.h +2 −2
  22. include/linux/path.h +2 −2
  23. include/net/9p/client.h +1 −1
  24. kernel/futex.c +1 −1
  25. mm/shmem.c +2 −3
  26. security/selinux/hooks.c +0 −9
arch/s390/hypfs/inode.c+2−4
@@ -171,12 +171,10 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov, · 170 unmodified lines
171 unsigned long nr_segs, loff_t offset)171 unsigned long nr_segs, loff_t offset)
172{172{
173 int rc;173 int rc;
174 struct super_block *sb;174 struct super_block *sb = file_inode(iocb->ki_filp)->i_sb;
175 struct hypfs_sb_info *fs_info;175 struct hypfs_sb_info *fs_info = sb->s_fs_info;
176 size_t count = iov_length(iov, nr_segs);176 size_t count = iov_length(iov, nr_segs);
177 177
178 sb = iocb->ki_filp->f_path.dentry->d_inode->i_sb;
179 fs_info = sb->s_fs_info;
180 /*178 /*
181 * Currently we only allow one update per second for two reasons:179 * Currently we only allow one update per second for two reasons:
182 * 1. diag 204 is VERY expensive180 * 1. diag 204 is VERY expensive
arch/x86/kernel/msr.c+4−5
@@ -71,7 +71,7 @@ static ssize_t msr_read(struct file *file, char __user *buf, · 70 unmodified lines
71 u32 __user *tmp = (u32 __user *) buf;71 u32 __user *tmp = (u32 __user *) buf;
72 u32 data[2];72 u32 data[2];
73 u32 reg = *ppos;73 u32 reg = *ppos;
74 int cpu = iminor(file->f_path.dentry->d_inode);74 int cpu = iminor(file_inode(file));
75 int err = 0;75 int err = 0;
76 ssize_t bytes = 0;76 ssize_t bytes = 0;
77 77
@@ -99,7 +99,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf, · 21 unmodified lines
99 const u32 __user *tmp = (const u32 __user *)buf;99 const u32 __user *tmp = (const u32 __user *)buf;
100 u32 data[2];100 u32 data[2];
101 u32 reg = *ppos;101 u32 reg = *ppos;
102 int cpu = iminor(file->f_path.dentry->d_inode);102 int cpu = iminor(file_inode(file));
103 int err = 0;103 int err = 0;
104 ssize_t bytes = 0;104 ssize_t bytes = 0;
105 105
@@ -125,7 +125,7 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg) · 19 unmodified lines
125{125{
126 u32 __user *uregs = (u32 __user *)arg;126 u32 __user *uregs = (u32 __user *)arg;
127 u32 regs[8];127 u32 regs[8];
128 int cpu = iminor(file->f_path.dentry->d_inode);128 int cpu = iminor(file_inode(file));
129 int err;129 int err;
130 130
131 switch (ioc) {131 switch (ioc) {
@@ -171,13 +171,12 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg) · 39 unmodified lines
171 171
172static int msr_open(struct inode *inode, struct file *file)172static int msr_open(struct inode *inode, struct file *file)
173{173{
174 unsigned int cpu;174 unsigned int cpu = iminor(file_inode(file));
175 struct cpuinfo_x86 *c;175 struct cpuinfo_x86 *c;
176 176
177 if (!capable(CAP_SYS_RAWIO))177 if (!capable(CAP_SYS_RAWIO))
178 return -EPERM;178 return -EPERM;
179 179
180 cpu = iminor(file->f_path.dentry->d_inode);
181 if (cpu >= nr_cpu_ids || !cpu_online(cpu))180 if (cpu >= nr_cpu_ids || !cpu_online(cpu))
182 return -ENXIO; /* No such CPU */181 return -ENXIO; /* No such CPU */
183 182
drivers/staging/comedi/comedi_fops.c+7−7
@@ -580,7 +580,7 @@ static int do_devinfo_ioctl(struct comedi_device *dev, · 579 unmodified lines
580 struct comedi_devinfo __user *arg,580 struct comedi_devinfo __user *arg,
581 struct file *file)581 struct file *file)
582{582{
583 const unsigned minor = iminor(file->f_dentry->d_inode);583 const unsigned minor = iminor(file_inode(file));
584 struct comedi_file_info *info = comedi_file_info_from_minor(minor);584 struct comedi_file_info *info = comedi_file_info_from_minor(minor);
585 struct comedi_subdevice *s;585 struct comedi_subdevice *s;
586 struct comedi_devinfo devinfo;586 struct comedi_devinfo devinfo;
@@ -1615,7 +1615,7 @@ static int do_poll_ioctl(struct comedi_device *dev, unsigned int arg, · 1028 unmodified lines
1615static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,1615static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
1616 unsigned long arg)1616 unsigned long arg)
1617{1617{
1618 const unsigned minor = iminor(file->f_dentry->d_inode);1618 const unsigned minor = iminor(file_inode(file));
1619 struct comedi_file_info *info = comedi_file_info_from_minor(minor);1619 struct comedi_file_info *info = comedi_file_info_from_minor(minor);
1620 struct comedi_device *dev = comedi_dev_from_file_info(info);1620 struct comedi_device *dev = comedi_dev_from_file_info(info);
1621 int rc;1621 int rc;
@@ -1743,7 +1743,7 @@ static struct vm_operations_struct comedi_vm_ops = { · 121 unmodified lines
1743 1743
1744static int comedi_mmap(struct file *file, struct vm_area_struct *vma)1744static int comedi_mmap(struct file *file, struct vm_area_struct *vma)
1745{1745{
1746 const unsigned minor = iminor(file->f_dentry->d_inode);1746 const unsigned minor = iminor(file_inode(file));
1747 struct comedi_file_info *info = comedi_file_info_from_minor(minor);1747 struct comedi_file_info *info = comedi_file_info_from_minor(minor);
1748 struct comedi_device *dev = comedi_dev_from_file_info(info);1748 struct comedi_device *dev = comedi_dev_from_file_info(info);
1749 struct comedi_subdevice *s;1749 struct comedi_subdevice *s;
@@ -1823,7 +1823,7 @@ done: · 73 unmodified lines
1823static unsigned int comedi_poll(struct file *file, poll_table *wait)1823static unsigned int comedi_poll(struct file *file, poll_table *wait)
1824{1824{
1825 unsigned int mask = 0;1825 unsigned int mask = 0;
1826 const unsigned minor = iminor(file->f_dentry->d_inode);1826 const unsigned minor = iminor(file_inode(file));
1827 struct comedi_file_info *info = comedi_file_info_from_minor(minor);1827 struct comedi_file_info *info = comedi_file_info_from_minor(minor);
1828 struct comedi_device *dev = comedi_dev_from_file_info(info);1828 struct comedi_device *dev = comedi_dev_from_file_info(info);
1829 struct comedi_subdevice *s;1829 struct comedi_subdevice *s;
@@ -1869,7 +1869,7 @@ static ssize_t comedi_write(struct file *file, const char __user *buf, · 39 unmodified lines
1869 struct comedi_async *async;1869 struct comedi_async *async;
1870 int n, m, count = 0, retval = 0;1870 int n, m, count = 0, retval = 0;
1871 DECLARE_WAITQUEUE(wait, current);1871 DECLARE_WAITQUEUE(wait, current);
1872 const unsigned minor = iminor(file->f_dentry->d_inode);1872 const unsigned minor = iminor(file_inode(file));
1873 struct comedi_file_info *info = comedi_file_info_from_minor(minor);1873 struct comedi_file_info *info = comedi_file_info_from_minor(minor);
1874 struct comedi_device *dev = comedi_dev_from_file_info(info);1874 struct comedi_device *dev = comedi_dev_from_file_info(info);
1875 1875
@@ -1964,7 +1964,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes, · 88 unmodified lines
1964 struct comedi_async *async;1964 struct comedi_async *async;
1965 int n, m, count = 0, retval = 0;1965 int n, m, count = 0, retval = 0;
1966 DECLARE_WAITQUEUE(wait, current);1966 DECLARE_WAITQUEUE(wait, current);
1967 const unsigned minor = iminor(file->f_dentry->d_inode);1967 const unsigned minor = iminor(file_inode(file));
1968 struct comedi_file_info *info = comedi_file_info_from_minor(minor);1968 struct comedi_file_info *info = comedi_file_info_from_minor(minor);
1969 struct comedi_device *dev = comedi_dev_from_file_info(info);1969 struct comedi_device *dev = comedi_dev_from_file_info(info);
1970 1970
@@ -2133,7 +2133,7 @@ ok: · 162 unmodified lines
2133 2133
2134static int comedi_fasync(int fd, struct file *file, int on)2134static int comedi_fasync(int fd, struct file *file, int on)
2135{2135{
2136 const unsigned minor = iminor(file->f_dentry->d_inode);2136 const unsigned minor = iminor(file_inode(file));
2137 struct comedi_device *dev = comedi_dev_from_minor(minor);2137 struct comedi_device *dev = comedi_dev_from_minor(minor);
2138 2138
2139 if (!dev)2139 if (!dev)
drivers/tty/tty_io.c+6−10
@@ -960,11 +960,10 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count, · 959 unmodified lines
960 loff_t *ppos)960 loff_t *ppos)
961{961{
962 int i;962 int i;
963 struct inode *inode = file->f_path.dentry->d_inode;
964 struct tty_struct *tty = file_tty(file);963 struct tty_struct *tty = file_tty(file);
965 struct tty_ldisc *ld;964 struct tty_ldisc *ld;
966 965
967 if (tty_paranoia_check(tty, inode, "tty_read"))966 if (tty_paranoia_check(tty, file_inode(file), "tty_read"))
968 return -EIO;967 return -EIO;
969 if (!tty || (test_bit(TTY_IO_ERROR, &tty->flags)))968 if (!tty || (test_bit(TTY_IO_ERROR, &tty->flags)))
970 return -EIO;969 return -EIO;
@@ -1132,12 +1131,11 @@ void tty_write_message(struct tty_struct *tty, char *msg) · 161 unmodified lines
1132static ssize_t tty_write(struct file *file, const char __user *buf,1131static ssize_t tty_write(struct file *file, const char __user *buf,
1133 size_t count, loff_t *ppos)1132 size_t count, loff_t *ppos)
1134{1133{
1135 struct inode *inode = file->f_path.dentry->d_inode;
1136 struct tty_struct *tty = file_tty(file);1134 struct tty_struct *tty = file_tty(file);
1137 struct tty_ldisc *ld;1135 struct tty_ldisc *ld;
1138 ssize_t ret;1136 ssize_t ret;
1139 1137
1140 if (tty_paranoia_check(tty, inode, "tty_write"))1138 if (tty_paranoia_check(tty, file_inode(file), "tty_write"))
1141 return -EIO;1139 return -EIO;
1142 if (!tty || !tty->ops->write ||1140 if (!tty || !tty->ops->write ||
1143 (test_bit(TTY_IO_ERROR, &tty->flags)))1141 (test_bit(TTY_IO_ERROR, &tty->flags)))
@@ -2047,7 +2045,7 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait) · 903 unmodified lines
2047 struct tty_ldisc *ld;2045 struct tty_ldisc *ld;
2048 int ret = 0;2046 int ret = 0;
2049 2047
2050 if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_poll"))2048 if (tty_paranoia_check(tty, file_inode(filp), "tty_poll"))
2051 return 0;2049 return 0;
2052 2050
2053 ld = tty_ldisc_ref_wait(tty);2051 ld = tty_ldisc_ref_wait(tty);
@@ -2063,7 +2061,7 @@ static int __tty_fasync(int fd, struct file *filp, int on) · 9 unmodified lines
2063 unsigned long flags;2061 unsigned long flags;
2064 int retval = 0;2062 int retval = 0;
2065 2063
2066 if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_fasync"))2064 if (tty_paranoia_check(tty, file_inode(filp), "tty_fasync"))
2067 goto out;2065 goto out;
2068 2066
2069 retval = fasync_helper(fd, filp, on, &tty->fasync);2067 retval = fasync_helper(fd, filp, on, &tty->fasync);
@@ -2637,9 +2635,8 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · 567 unmodified lines
2637 void __user *p = (void __user *)arg;2635 void __user *p = (void __user *)arg;
2638 int retval;2636 int retval;
2639 struct tty_ldisc *ld;2637 struct tty_ldisc *ld;
2640 struct inode *inode = file->f_dentry->d_inode;
2641 2638
2642 if (tty_paranoia_check(tty, inode, "tty_ioctl"))2639 if (tty_paranoia_check(tty, file_inode(file), "tty_ioctl"))
2643 return -EINVAL;2640 return -EINVAL;
2644 2641
2645 real_tty = tty_pair_get_tty(tty);2642 real_tty = tty_pair_get_tty(tty);
@@ -2780,12 +2777,11 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) · 134 unmodified lines
2780static long tty_compat_ioctl(struct file *file, unsigned int cmd,2777static long tty_compat_ioctl(struct file *file, unsigned int cmd,
2781 unsigned long arg)2778 unsigned long arg)
2782{2779{
2783 struct inode *inode = file->f_dentry->d_inode;
2784 struct tty_struct *tty = file_tty(file);2780 struct tty_struct *tty = file_tty(file);
2785 struct tty_ldisc *ld;2781 struct tty_ldisc *ld;
2786 int retval = -ENOIOCTLCMD;2782 int retval = -ENOIOCTLCMD;
2787 2783
2788 if (tty_paranoia_check(tty, inode, "tty_ioctl"))2784 if (tty_paranoia_check(tty, file_inode(file), "tty_ioctl"))
2789 return -EINVAL;2785 return -EINVAL;
2790 2786
2791 if (tty->ops->compat_ioctl) {2787 if (tty->ops->compat_ioctl) {
fs/9p/fid.c+25−29
@@ -41,29 +41,16 @@ · 40 unmodified lines
41 *41 *
42 */42 */
43 43
44int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid)44static inline void __add_fid(struct dentry *dentry, struct p9_fid *fid)
45{45{
46 struct v9fs_dentry *dent;46 hlist_add_head(&fid->dlist, (struct hlist_head *)&dentry->d_fsdata);
47 47}
48 p9_debug(P9_DEBUG_VFS, "fid %d dentry %s\n",
49 fid->fid, dentry->d_name.name);
50
51 dent = dentry->d_fsdata;
52 if (!dent) {
53 dent = kmalloc(sizeof(struct v9fs_dentry), GFP_KERNEL);
54 if (!dent)
55 return -ENOMEM;
56
57 spin_lock_init(&dent->lock);
58 INIT_LIST_HEAD(&dent->fidlist);
59 dentry->d_fsdata = dent;
60 }
61
62 spin_lock(&dent->lock);
63 list_add(&fid->dlist, &dent->fidlist);
64 spin_unlock(&dent->lock);
65 48
66 return 0;49void v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid)
50{
51 spin_lock(&dentry->d_lock);
52 __add_fid(dentry, fid);
53 spin_unlock(&dentry->d_lock);
67}54}
68 55
69/**56/**
@@ -76,23 +63,23 @@ int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid) · 6 unmodified lines
76 63
77static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)64static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)
78{65{
79 struct v9fs_dentry *dent;
80 struct p9_fid *fid, *ret;66 struct p9_fid *fid, *ret;
81 67
82 p9_debug(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n",68 p9_debug(P9_DEBUG_VFS, " dentry: %s (%p) uid %d any %d\n",
83 dentry->d_name.name, dentry, from_kuid(&init_user_ns, uid),69 dentry->d_name.name, dentry, from_kuid(&init_user_ns, uid),
84 any);70 any);
85 dent = (struct v9fs_dentry *) dentry->d_fsdata;
86 ret = NULL;71 ret = NULL;
87 if (dent) {72 /* we'll recheck under lock if there's anything to look in */
88 spin_lock(&dent->lock);73 if (dentry->d_fsdata) {
89 list_for_each_entry(fid, &dent->fidlist, dlist) {74 struct hlist_head *h = (struct hlist_head *)&dentry->d_fsdata;
75 spin_lock(&dentry->d_lock);
76 hlist_for_each_entry(fid, h, dlist) {
90 if (any || uid_eq(fid->uid, uid)) {77 if (any || uid_eq(fid->uid, uid)) {
91 ret = fid;78 ret = fid;
92 break;79 break;
93 }80 }
94 }81 }
95 spin_unlock(&dent->lock);82 spin_unlock(&dentry->d_lock);
96 }83 }
97 84
98 return ret;85 return ret;
@@ -215,8 +202,17 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, · 116 unmodified lines
215 }202 }
216 kfree(wnames);203 kfree(wnames);
217fid_out:204fid_out:
218 if (!IS_ERR(fid))205 if (!IS_ERR(fid)) {
219 v9fs_fid_add(dentry, fid);206 spin_lock(&dentry->d_lock);
207 if (d_unhashed(dentry)) {
208 spin_unlock(&dentry->d_lock);
209 p9_client_clunk(fid);
210 fid = ERR_PTR(-ENOENT);
211 } else {
212 __add_fid(dentry, fid);
213 spin_unlock(&dentry->d_lock);
214 }
215 }
220err_out:216err_out:
221 up_read(&v9ses->rename_sem);217 up_read(&v9ses->rename_sem);
222 return fid;218 return fid;
fs/9p/fid.h+1−21
@@ -23,28 +23,8 @@ · 22 unmodified lines
23#define FS_9P_FID_H23#define FS_9P_FID_H
24#include <linux/list.h>24#include <linux/list.h>
25 25
26/**
27 * struct v9fs_dentry - 9p private data stored in dentry d_fsdata
28 * @lock: protects the fidlist
29 * @fidlist: list of FIDs currently associated with this dentry
30 *
31 * This structure defines the 9p private data associated with
32 * a particular dentry. In particular, this private data is used
33 * to lookup which 9P FID handle should be used for a particular VFS
34 * operation. FID handles are associated with dentries instead of
35 * inodes in order to more closely map functionality to the Plan 9
36 * expected behavior for FID reclaimation and tracking.
37 *
38 * See Also: Mapping FIDs to Linux VFS model in
39 * Design and Implementation of the Linux 9P File System documentation
40 */
41struct v9fs_dentry {
42 spinlock_t lock; /* protect fidlist */
43 struct list_head fidlist;
44};
45
46struct p9_fid *v9fs_fid_lookup(struct dentry *dentry);26struct p9_fid *v9fs_fid_lookup(struct dentry *dentry);
47struct p9_fid *v9fs_fid_clone(struct dentry *dentry);27struct p9_fid *v9fs_fid_clone(struct dentry *dentry);
48int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid);28void v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid);
49struct p9_fid *v9fs_writeback_fid(struct dentry *dentry);29struct p9_fid *v9fs_writeback_fid(struct dentry *dentry);
50#endif30#endif
fs/9p/vfs_dentry.c+4−13
@@ -83,21 +83,12 @@ static int v9fs_cached_dentry_delete(const struct dentry *dentry) · 82 unmodified lines
83 83
84static void v9fs_dentry_release(struct dentry *dentry)84static void v9fs_dentry_release(struct dentry *dentry)
85{85{
86 struct v9fs_dentry *dent;86 struct hlist_node *p, *n;
87 struct p9_fid *temp, *current_fid;
88
89 p9_debug(P9_DEBUG_VFS, " dentry: %s (%p)\n",87 p9_debug(P9_DEBUG_VFS, " dentry: %s (%p)\n",
90 dentry->d_name.name, dentry);88 dentry->d_name.name, dentry);
91 dent = dentry->d_fsdata;89 hlist_for_each_safe(p, n, (struct hlist_head *)&dentry->d_fsdata)
92 if (dent) {90 p9_client_clunk(hlist_entry(p, struct p9_fid, dlist));
93 list_for_each_entry_safe(current_fid, temp, &dent->fidlist,91 dentry->d_fsdata = NULL;
94 dlist) {
95 p9_client_clunk(current_fid);
96 }
97
98 kfree(dent);
99 dentry->d_fsdata = NULL;
100 }
101}92}
102 93
103static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags)94static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags)
fs/9p/vfs_inode.c+14−26
@@ -692,9 +692,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir, · 691 unmodified lines
692 "inode creation failed %d\n", err);692 "inode creation failed %d\n", err);
693 goto error;693 goto error;
694 }694 }
695 err = v9fs_fid_add(dentry, fid);695 v9fs_fid_add(dentry, fid);
696 if (err < 0)
697 goto error;
698 d_instantiate(dentry, inode);696 d_instantiate(dentry, inode);
699 }697 }
700 return ofid;698 return ofid;
@@ -790,7 +788,6 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, · 89 unmodified lines
790 struct p9_fid *dfid, *fid;788 struct p9_fid *dfid, *fid;
791 struct inode *inode;789 struct inode *inode;
792 char *name;790 char *name;
793 int result = 0;
794 791
795 p9_debug(P9_DEBUG_VFS, "dir: %p dentry: (%s) %p flags: %x\n",792 p9_debug(P9_DEBUG_VFS, "dir: %p dentry: (%s) %p flags: %x\n",
796 dir, dentry->d_name.name, dentry, flags);793 dir, dentry->d_name.name, dentry, flags);
@@ -808,13 +805,11 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, · 11 unmodified lines
808 name = (char *) dentry->d_name.name;805 name = (char *) dentry->d_name.name;
809 fid = p9_client_walk(dfid, 1, &name, 1);806 fid = p9_client_walk(dfid, 1, &name, 1);
810 if (IS_ERR(fid)) {807 if (IS_ERR(fid)) {
811 result = PTR_ERR(fid);808 if (fid == ERR_PTR(-ENOENT)) {
812 if (result == -ENOENT) {809 d_add(dentry, NULL);
813 inode = NULL;810 return NULL;
814 goto inst_out;
815 }811 }
816 812 return ERR_CAST(fid);
817 return ERR_PTR(result);
818 }813 }
819 /*814 /*
820 * Make sure we don't use a wrong inode due to parallel815 * Make sure we don't use a wrong inode due to parallel
@@ -826,14 +821,9 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, · 5 unmodified lines
826 else821 else
827 inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);822 inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);
828 if (IS_ERR(inode)) {823 if (IS_ERR(inode)) {
829 result = PTR_ERR(inode);824 p9_client_clunk(fid);
830 inode = NULL;825 return ERR_CAST(inode);
831 goto error;
832 }826 }
833 result = v9fs_fid_add(dentry, fid);
834 if (result < 0)
835 goto error_iput;
836inst_out:
837 /*827 /*
838 * If we had a rename on the server and a parallel lookup828 * If we had a rename on the server and a parallel lookup
839 * for the new name, then make sure we instantiate with829 * for the new name, then make sure we instantiate with
@@ -842,15 +832,13 @@ inst_out: · 2 unmodified lines
842 * k/b.832 * k/b.
843 */833 */
844 res = d_materialise_unique(dentry, inode);834 res = d_materialise_unique(dentry, inode);
845 if (!IS_ERR(res))835 if (!res)
846 return res;836 v9fs_fid_add(dentry, fid);
847 result = PTR_ERR(res);837 else if (!IS_ERR(res))
848error_iput:838 v9fs_fid_add(res, fid);
849 iput(inode);839 else
850error:840 p9_client_clunk(fid);
851 p9_client_clunk(fid);841 return res;
852
853 return ERR_PTR(result);
854}842}
855 843
856static int844static int
fs/9p/vfs_inode_dotl.c+7−12
@@ -333,9 +333,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry, · 332 unmodified lines
333 /* Now set the ACL based on the default value */333 /* Now set the ACL based on the default value */
334 v9fs_set_create_acl(inode, fid, dacl, pacl);334 v9fs_set_create_acl(inode, fid, dacl, pacl);
335 335
336 err = v9fs_fid_add(dentry, fid);336 v9fs_fid_add(dentry, fid);
337 if (err < 0)
338 goto error;
339 d_instantiate(dentry, inode);337 d_instantiate(dentry, inode);
340 338
341 v9inode = V9FS_I(inode);339 v9inode = V9FS_I(inode);
@@ -453,12 +451,11 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir, · 111 unmodified lines
453 err);451 err);
454 goto error;452 goto error;
455 }453 }
456 err = v9fs_fid_add(dentry, fid);454 v9fs_fid_add(dentry, fid);
457 if (err < 0)
458 goto error;
459 v9fs_set_create_acl(inode, fid, dacl, pacl);455 v9fs_set_create_acl(inode, fid, dacl, pacl);
460 d_instantiate(dentry, inode);456 d_instantiate(dentry, inode);
461 fid = NULL;457 fid = NULL;
458 err = 0;
462 } else {459 } else {
463 /*460 /*
464 * Not in cached mode. No need to populate461 * Not in cached mode. No need to populate
@@ -747,11 +744,10 @@ v9fs_vfs_symlink_dotl(struct inode *dir, struct dentry *dentry, · 282 unmodified lines
747 err);744 err);
748 goto error;745 goto error;
749 }746 }
750 err = v9fs_fid_add(dentry, fid);747 v9fs_fid_add(dentry, fid);
751 if (err < 0)
752 goto error;
753 d_instantiate(dentry, inode);748 d_instantiate(dentry, inode);
754 fid = NULL;749 fid = NULL;
750 err = 0;
755 } else {751 } else {
756 /* Not in cached mode. No need to populate inode with stat */752 /* Not in cached mode. No need to populate inode with stat */
757 inode = v9fs_get_inode(dir->i_sb, S_IFLNK, 0);753 inode = v9fs_get_inode(dir->i_sb, S_IFLNK, 0);
@@ -900,11 +896,10 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode, · 142 unmodified lines
900 goto error;896 goto error;
901 }897 }
902 v9fs_set_create_acl(inode, fid, dacl, pacl);898 v9fs_set_create_acl(inode, fid, dacl, pacl);
903 err = v9fs_fid_add(dentry, fid);899 v9fs_fid_add(dentry, fid);
904 if (err < 0)
905 goto error;
906 d_instantiate(dentry, inode);900 d_instantiate(dentry, inode);
907 fid = NULL;901 fid = NULL;
902 err = 0;
908 } else {903 } else {
909 /*904 /*
910 * Not in cached mode. No need to populate inode with stat.905 * Not in cached mode. No need to populate inode with stat.
fs/ext4/indirect.c+1−1
@@ -1606,7 +1606,7 @@ err: · 1605 unmodified lines
1606 1606
1607int ext4_ind_punch_hole(struct file *file, loff_t offset, loff_t length)1607int ext4_ind_punch_hole(struct file *file, loff_t offset, loff_t length)
1608{1608{
1609 struct inode *inode = file->f_path.dentry->d_inode;1609 struct inode *inode = file_inode(file);
1610 struct super_block *sb = inode->i_sb;1610 struct super_block *sb = inode->i_sb;
1611 ext4_lblk_t first_block, stop_block;1611 ext4_lblk_t first_block, stop_block;
1612 struct address_space *mapping = inode->i_mapping;1612 struct address_space *mapping = inode->i_mapping;
fs/f2fs/file.c+3−3
@@ -29,7 +29,7 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma, · 28 unmodified lines
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, · 508 unmodified lines
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) · 26 unmodified lines
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;
fs/file_table.c+2−0
@@ -176,6 +176,7 @@ struct file *alloc_file(struct path *path, fmode_t mode, · 175 unmodified lines
176 return file;176 return file;
177 177
178 file->f_path = *path;178 file->f_path = *path;
179 file->f_inode = path->dentry->d_inode;
179 file->f_mapping = path->dentry->d_inode->i_mapping;180 file->f_mapping = path->dentry->d_inode->i_mapping;
180 file->f_mode = mode;181 file->f_mode = mode;
181 file->f_op = fop;182 file->f_op = fop;
@@ -258,6 +259,7 @@ static void __fput(struct file *file) · 76 unmodified lines
258 drop_file_write_access(file);259 drop_file_write_access(file);
259 file->f_path.dentry = NULL;260 file->f_path.dentry = NULL;
260 file->f_path.mnt = NULL;261 file->f_path.mnt = NULL;
262 file->f_inode = NULL;
261 file_free(file);263 file_free(file);
262 dput(dentry);264 dput(dentry);
263 mntput(mnt);265 mntput(mnt);
fs/fs_struct.c+3−3
@@ -10,7 +10,7 @@ · 9 unmodified lines
10 * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.10 * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
11 * It can block.11 * It can block.
12 */12 */
13void set_fs_root(struct fs_struct *fs, struct path *path)13void set_fs_root(struct fs_struct *fs, const struct path *path)
14{14{
15 struct path old_root;15 struct path old_root;
16 16
@@ -29,7 +29,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path) · 12 unmodified lines
29 * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values.29 * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values.
30 * It can block.30 * It can block.
31 */31 */
32void set_fs_pwd(struct fs_struct *fs, struct path *path)32void set_fs_pwd(struct fs_struct *fs, const struct path *path)
33{33{
34 struct path old_pwd;34 struct path old_pwd;
35 35
@@ -53,7 +53,7 @@ static inline int replace_path(struct path *p, const struct path *old, const str · 17 unmodified lines
53 return 1;53 return 1;
54}54}
55 55
56void chroot_fs_refs(struct path *old_root, struct path *new_root)56void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
57{57{
58 struct task_struct *g, *p;58 struct task_struct *g, *p;
59 struct fs_struct *fs;59 struct fs_struct *fs;
fs/fuse/dev.c+1−1
@@ -532,7 +532,7 @@ void fuse_request_send_background_locked(struct fuse_conn *fc, · 531 unmodified lines
532 532
533void fuse_force_forget(struct file *file, u64 nodeid)533void fuse_force_forget(struct file *file, u64 nodeid)
534{534{
535 struct inode *inode = file->f_path.dentry->d_inode;535 struct inode *inode = file_inode(file);
536 struct fuse_conn *fc = get_fuse_conn(inode);536 struct fuse_conn *fc = get_fuse_conn(inode);
537 struct fuse_req *req;537 struct fuse_req *req;
538 struct fuse_forget_in inarg;538 struct fuse_forget_in inarg;
fs/fuse/file.c+12−12
@@ -355,7 +355,7 @@ static int fuse_wait_on_page_writeback(struct inode *inode, pgoff_t index) · 354 unmodified lines
355 355
356static int fuse_flush(struct file *file, fl_owner_t id)356static int fuse_flush(struct file *file, fl_owner_t id)
357{357{
358 struct inode *inode = file->f_path.dentry->d_inode;358 struct inode *inode = file_inode(file);
359 struct fuse_conn *fc = get_fuse_conn(inode);359 struct fuse_conn *fc = get_fuse_conn(inode);
360 struct fuse_file *ff = file->private_data;360 struct fuse_file *ff = file->private_data;
361 struct fuse_req *req;361 struct fuse_req *req;
@@ -1215,7 +1215,7 @@ static ssize_t __fuse_direct_read(struct file *file, const struct iovec *iov, · 853 unmodified lines
1215 unsigned long nr_segs, loff_t *ppos)1215 unsigned long nr_segs, loff_t *ppos)
1216{1216{
1217 ssize_t res;1217 ssize_t res;
1218 struct inode *inode = file->f_path.dentry->d_inode;1218 struct inode *inode = file_inode(file);
1219 1219
1220 if (is_bad_inode(inode))1220 if (is_bad_inode(inode))
1221 return -EIO;1221 return -EIO;
@@ -1238,7 +1238,7 @@ static ssize_t fuse_direct_read(struct file *file, char __user *buf, · 16 unmodified lines
1238static ssize_t __fuse_direct_write(struct file *file, const struct iovec *iov,1238static ssize_t __fuse_direct_write(struct file *file, const struct iovec *iov,
1239 unsigned long nr_segs, loff_t *ppos)1239 unsigned long nr_segs, loff_t *ppos)
1240{1240{
1241 struct inode *inode = file->f_path.dentry->d_inode;1241 struct inode *inode = file_inode(file);
1242 size_t count = iov_length(iov, nr_segs);1242 size_t count = iov_length(iov, nr_segs);
1243 ssize_t res;1243 ssize_t res;
1244 1244
@@ -1258,7 +1258,7 @@ static ssize_t fuse_direct_write(struct file *file, const char __user *buf, · 13 unmodified lines
1258 size_t count, loff_t *ppos)1258 size_t count, loff_t *ppos)
1259{1259{
1260 struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = count };1260 struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = count };
1261 struct inode *inode = file->f_path.dentry->d_inode;1261 struct inode *inode = file_inode(file);
1262 ssize_t res;1262 ssize_t res;
1263 1263
1264 if (is_bad_inode(inode))1264 if (is_bad_inode(inode))
@@ -1485,7 +1485,7 @@ static const struct vm_operations_struct fuse_file_vm_ops = { · 220 unmodified lines
1485static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma)1485static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma)
1486{1486{
1487 if ((vma->vm_flags & VM_SHARED) && (vma->vm_flags & VM_MAYWRITE)) {1487 if ((vma->vm_flags & VM_SHARED) && (vma->vm_flags & VM_MAYWRITE)) {
1488 struct inode *inode = file->f_dentry->d_inode;1488 struct inode *inode = file_inode(file);
1489 struct fuse_conn *fc = get_fuse_conn(inode);1489 struct fuse_conn *fc = get_fuse_conn(inode);
1490 struct fuse_inode *fi = get_fuse_inode(inode);1490 struct fuse_inode *fi = get_fuse_inode(inode);
1491 struct fuse_file *ff = file->private_data;1491 struct fuse_file *ff = file->private_data;
@@ -1543,7 +1543,7 @@ static void fuse_lk_fill(struct fuse_req *req, struct file *file, · 51 unmodified lines
1543 const struct file_lock *fl, int opcode, pid_t pid,1543 const struct file_lock *fl, int opcode, pid_t pid,
1544 int flock)1544 int flock)
1545{1545{
1546 struct inode *inode = file->f_path.dentry->d_inode;1546 struct inode *inode = file_inode(file);
1547 struct fuse_conn *fc = get_fuse_conn(inode);1547 struct fuse_conn *fc = get_fuse_conn(inode);
1548 struct fuse_file *ff = file->private_data;1548 struct fuse_file *ff = file->private_data;
1549 struct fuse_lk_in *arg = &req->misc.lk_in;1549 struct fuse_lk_in *arg = &req->misc.lk_in;
@@ -1565,7 +1565,7 @@ static void fuse_lk_fill(struct fuse_req *req, struct file *file, · 15 unmodified lines
1565 1565
1566static int fuse_getlk(struct file *file, struct file_lock *fl)1566static int fuse_getlk(struct file *file, struct file_lock *fl)
1567{1567{
1568 struct inode *inode = file->f_path.dentry->d_inode;1568 struct inode *inode = file_inode(file);
1569 struct fuse_conn *fc = get_fuse_conn(inode);1569 struct fuse_conn *fc = get_fuse_conn(inode);
1570 struct fuse_req *req;1570 struct fuse_req *req;
1571 struct fuse_lk_out outarg;1571 struct fuse_lk_out outarg;
@@ -1590,7 +1590,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl) · 18 unmodified lines
1590 1590
1591static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)1591static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
1592{1592{
1593 struct inode *inode = file->f_path.dentry->d_inode;1593 struct inode *inode = file_inode(file);
1594 struct fuse_conn *fc = get_fuse_conn(inode);1594 struct fuse_conn *fc = get_fuse_conn(inode);
1595 struct fuse_req *req;1595 struct fuse_req *req;
1596 int opcode = (fl->fl_flags & FL_SLEEP) ? FUSE_SETLKW : FUSE_SETLK;1596 int opcode = (fl->fl_flags & FL_SLEEP) ? FUSE_SETLKW : FUSE_SETLK;
@@ -1622,7 +1622,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock) · 25 unmodified lines
1622 1622
1623static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)1623static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)
1624{1624{
1625 struct inode *inode = file->f_path.dentry->d_inode;1625 struct inode *inode = file_inode(file);
1626 struct fuse_conn *fc = get_fuse_conn(inode);1626 struct fuse_conn *fc = get_fuse_conn(inode);
1627 int err;1627 int err;
1628 1628
@@ -1645,7 +1645,7 @@ static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl) · 16 unmodified lines
1645 1645
1646static int fuse_file_flock(struct file *file, int cmd, struct file_lock *fl)1646static int fuse_file_flock(struct file *file, int cmd, struct file_lock *fl)
1647{1647{
1648 struct inode *inode = file->f_path.dentry->d_inode;1648 struct inode *inode = file_inode(file);
1649 struct fuse_conn *fc = get_fuse_conn(inode);1649 struct fuse_conn *fc = get_fuse_conn(inode);
1650 int err;1650 int err;
1651 1651
@@ -1702,7 +1702,7 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block) · 50 unmodified lines
1702static loff_t fuse_file_llseek(struct file *file, loff_t offset, int whence)1702static loff_t fuse_file_llseek(struct file *file, loff_t offset, int whence)
1703{1703{
1704 loff_t retval;1704 loff_t retval;
1705 struct inode *inode = file->f_path.dentry->d_inode;1705 struct inode *inode = file_inode(file);
1706 1706
1707 /* No i_mutex protection necessary for SEEK_CUR and SEEK_SET */1707 /* No i_mutex protection necessary for SEEK_CUR and SEEK_SET */
1708 if (whence == SEEK_CUR || whence == SEEK_SET)1708 if (whence == SEEK_CUR || whence == SEEK_SET)
@@ -2079,7 +2079,7 @@ EXPORT_SYMBOL_GPL(fuse_do_ioctl); · 370 unmodified lines
2079long fuse_ioctl_common(struct file *file, unsigned int cmd,2079long fuse_ioctl_common(struct file *file, unsigned int cmd,
2080 unsigned long arg, unsigned int flags)2080 unsigned long arg, unsigned int flags)
2081{2081{
2082 struct inode *inode = file->f_dentry->d_inode;2082 struct inode *inode = file_inode(file);
2083 struct fuse_conn *fc = get_fuse_conn(inode);2083 struct fuse_conn *fc = get_fuse_conn(inode);
2084 2084
2085 if (!fuse_allow_current_process(fc))2085 if (!fuse_allow_current_process(fc))
fs/internal.h+1−1
@@ -69,7 +69,7 @@ extern void __mnt_drop_write_file(struct file *); · 68 unmodified lines
69/*69/*
70 * fs_struct.c70 * fs_struct.c
71 */71 */
72extern void chroot_fs_refs(struct path *, struct path *);72extern void chroot_fs_refs(const struct path *, const struct path *);
73 73
74/*74/*
75 * file_table.c75 * file_table.c
fs/namei.c+2−2
@@ -451,7 +451,7 @@ int inode_permission(struct inode *inode, int mask) · 450 unmodified lines
451 *451 *
452 * Given a path increment the reference count to the dentry and the vfsmount.452 * Given a path increment the reference count to the dentry and the vfsmount.
453 */453 */
454void path_get(struct path *path)454void path_get(const struct path *path)
455{455{
456 mntget(path->mnt);456 mntget(path->mnt);
457 dget(path->dentry);457 dget(path->dentry);
@@ -464,7 +464,7 @@ EXPORT_SYMBOL(path_get); · 6 unmodified lines
464 *464 *
465 * Given a path decrement the reference count to the dentry and the vfsmount.465 * Given a path decrement the reference count to the dentry and the vfsmount.
466 */466 */
467void path_put(struct path *path)467void path_put(const struct path *path)
468{468{
469 dput(path->dentry);469 dput(path->dentry);
470 mntput(path->mnt);470 mntput(path->mnt);
fs/open.c+2−1
@@ -704,7 +704,7 @@ static int do_dentry_open(struct file *f, · 703 unmodified lines
704 f->f_mode = FMODE_PATH;704 f->f_mode = FMODE_PATH;
705 705
706 path_get(&f->f_path);706 path_get(&f->f_path);
707 inode = file_inode(f);707 inode = f->f_inode = f->f_path.dentry->d_inode;
708 if (f->f_mode & FMODE_WRITE) {708 if (f->f_mode & FMODE_WRITE) {
709 error = __get_file_write_access(inode, f->f_path.mnt);709 error = __get_file_write_access(inode, f->f_path.mnt);
710 if (error)710 if (error)
@@ -767,6 +767,7 @@ cleanup_file: · 56 unmodified lines
767 path_put(&f->f_path);767 path_put(&f->f_path);
768 f->f_path.mnt = NULL;768 f->f_path.mnt = NULL;
769 f->f_path.dentry = NULL;769 f->f_path.dentry = NULL;
770 f->f_inode = NULL;
770 return error;771 return error;
771}772}
772 773
fs/seq_file.c+1−1
@@ -339,7 +339,7 @@ EXPORT_SYMBOL(seq_lseek); · 338 unmodified lines
339/**339/**
340 * seq_release - free the structures associated with sequential file.340 * seq_release - free the structures associated with sequential file.
341 * @file: file in question341 * @file: file in question
342 * @inode: file->f_path.dentry->d_inode342 * @inode: its inode
343 *343 *
344 * Frees the structures associated with sequential file; can be used344 * Frees the structures associated with sequential file; can be used
345 * as ->f_op->release() if you don't have private data to destroy.345 * as ->f_op->release() if you don't have private data to destroy.
include/linux/fs.h+2−1
@@ -769,6 +769,7 @@ struct file { · 768 unmodified lines
769 } f_u;769 } f_u;
770 struct path f_path;770 struct path f_path;
771#define f_dentry f_path.dentry771#define f_dentry f_path.dentry
772 struct inode *f_inode; /* cached value */
772 const struct file_operations *f_op;773 const struct file_operations *f_op;
773 774
774 /*775 /*
@@ -2217,7 +2218,7 @@ static inline bool execute_ok(struct inode *inode) · 1442 unmodified lines
2217 2218
2218static inline struct inode *file_inode(struct file *f)2219static inline struct inode *file_inode(struct file *f)
2219{2220{
2220 return f->f_path.dentry->d_inode;2221 return f->f_inode;
2221}2222}
2222 2223
2223/*2224/*
include/linux/fs_struct.h+2−2
@@ -17,8 +17,8 @@ struct fs_struct { · 16 unmodified lines
17extern struct kmem_cache *fs_cachep;17extern struct kmem_cache *fs_cachep;
18 18
19extern void exit_fs(struct task_struct *);19extern void exit_fs(struct task_struct *);
20extern void set_fs_root(struct fs_struct *, struct path *);20extern void set_fs_root(struct fs_struct *, const struct path *);
21extern void set_fs_pwd(struct fs_struct *, struct path *);21extern void set_fs_pwd(struct fs_struct *, const struct path *);
22extern struct fs_struct *copy_fs_struct(struct fs_struct *);22extern struct fs_struct *copy_fs_struct(struct fs_struct *);
23extern void free_fs_struct(struct fs_struct *);23extern void free_fs_struct(struct fs_struct *);
24extern int unshare_fs_struct(void);24extern int unshare_fs_struct(void);
include/linux/path.h+2−2
@@ -9,8 +9,8 @@ struct path { · 8 unmodified lines
9 struct dentry *dentry;9 struct dentry *dentry;
10};10};
11 11
12extern void path_get(struct path *);12extern void path_get(const struct path *);
13extern void path_put(struct path *);13extern void path_put(const struct path *);
14 14
15static inline int path_equal(const struct path *path1, const struct path *path2)15static inline int path_equal(const struct path *path1, const struct path *path2)
16{16{
include/net/9p/client.h+1−1
@@ -192,7 +192,7 @@ struct p9_fid { · 191 unmodified lines
192 void *rdir;192 void *rdir;
193 193
194 struct list_head flist;194 struct list_head flist;
195 struct list_head dlist; /* list of all fids attached to a dentry */195 struct hlist_node dlist; /* list of all fids attached to a dentry */
196};196};
197 197
198/**198/**
kernel/futex.c+1−1
@@ -226,7 +226,7 @@ static void drop_futex_key_refs(union futex_key *key) · 225 unmodified lines
226 * Returns a negative error code or 0226 * Returns a negative error code or 0
227 * The key words are stored in *key on success.227 * The key words are stored in *key on success.
228 *228 *
229 * For shared mappings, it's (page->index, vma->vm_file->f_path.dentry->d_inode,229 * For shared mappings, it's (page->index, file_inode(vma->vm_file),
230 * offset_within_page). For private mappings, it's (uaddr, current->mm).230 * offset_within_page). For private mappings, it's (uaddr, current->mm).
231 * We can usually work out the index without swapping in the page.231 * We can usually work out the index without swapping in the page.
232 *232 *
mm/shmem.c+2−3
@@ -2932,9 +2932,8 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags · 2931 unmodified lines
2932 inode->i_size = size;2932 inode->i_size = size;
2933 clear_nlink(inode); /* It is unlinked */2933 clear_nlink(inode); /* It is unlinked */
2934#ifndef CONFIG_MMU2934#ifndef CONFIG_MMU
2935 error = ramfs_nommu_expand_for_mapping(inode, size);2935 res = ERR_PTR(ramfs_nommu_expand_for_mapping(inode, size));
2936 res = ERR_PTR(error);2936 if (IS_ERR(res))
2937 if (error)
2938 goto put_dentry;2937 goto put_dentry;
2939#endif2938#endif
2940 2939
security/selinux/hooks.c+0−9
@@ -3135,11 +3135,6 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd, · 3134 unmodified lines
3135 3135
3136 switch (cmd) {3136 switch (cmd) {
3137 case F_SETFL:3137 case F_SETFL:
3138 if (!file->f_path.dentry || !file->f_path.dentry->d_inode) {
3139 err = -EINVAL;
3140 break;
3141 }
3142
3143 if ((file->f_flags & O_APPEND) && !(arg & O_APPEND)) {3138 if ((file->f_flags & O_APPEND) && !(arg & O_APPEND)) {
3144 err = file_has_perm(cred, file, FILE__WRITE);3139 err = file_has_perm(cred, file, FILE__WRITE);
3145 break;3140 break;
@@ -3162,10 +3157,6 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd, · 16 unmodified lines
3162 case F_SETLK64:3157 case F_SETLK64:
3163 case F_SETLKW64:3158 case F_SETLKW64:
3164#endif3159#endif
3165 if (!file->f_path.dentry || !file->f_path.dentry->d_inode) {
3166 err = -EINVAL;
3167 break;
3168 }
3169 err = file_has_perm(cred, file, FILE__LOCK);3160 err = file_has_perm(cred, file, FILE__LOCK);
3170 break;3161 break;
3171 }3162 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t