Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e678fb0d523c118fc2f903d62cb54c89b6b68185

Authored by Josef "Jeff" Sipek
Committed by Linus Torvalds
1 parent bd243a4b4b

[PATCH] xfs: change uses of f_{dentry,vfsmnt} to use f_path 

Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the xfs
filesystem.

Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 5 changed files with 23 additions and 23 deletions Side-by-side Diff

fs/xfs/linux-2.6/xfs_file.c
Diff comments   View file @ e678fb0
... ... @@ -55,7 +55,7 @@
55 55 loff_t pos)
56 56 {
57 57 struct file *file = iocb->ki_filp;
58   - bhv_vnode_t *vp = vn_from_inode(file->f_dentry->d_inode);
  58 + bhv_vnode_t *vp = vn_from_inode(file->f_path.dentry->d_inode);
59 59  
60 60 BUG_ON(iocb->ki_pos != pos);
61 61 if (unlikely(file->f_flags & O_DIRECT))
... ... @@ -131,7 +131,7 @@
131 131 read_actor_t actor,
132 132 void *target)
133 133 {
134   - return bhv_vop_sendfile(vn_from_inode(filp->f_dentry->d_inode),
  134 + return bhv_vop_sendfile(vn_from_inode(filp->f_path.dentry->d_inode),
135 135 filp, pos, 0, count, actor, target, NULL);
136 136 }
137 137  
... ... @@ -143,7 +143,7 @@
143 143 read_actor_t actor,
144 144 void *target)
145 145 {
146   - return bhv_vop_sendfile(vn_from_inode(filp->f_dentry->d_inode),
  146 + return bhv_vop_sendfile(vn_from_inode(filp->f_path.dentry->d_inode),
147 147 filp, pos, IO_INVIS, count, actor, target, NULL);
148 148 }
149 149  
... ... @@ -155,7 +155,7 @@
155 155 size_t len,
156 156 unsigned int flags)
157 157 {
158   - return bhv_vop_splice_read(vn_from_inode(infilp->f_dentry->d_inode),
  158 + return bhv_vop_splice_read(vn_from_inode(infilp->f_path.dentry->d_inode),
159 159 infilp, ppos, pipe, len, flags, 0, NULL);
160 160 }
161 161  
... ... @@ -167,7 +167,7 @@
167 167 size_t len,
168 168 unsigned int flags)
169 169 {
170   - return bhv_vop_splice_read(vn_from_inode(infilp->f_dentry->d_inode),
  170 + return bhv_vop_splice_read(vn_from_inode(infilp->f_path.dentry->d_inode),
171 171 infilp, ppos, pipe, len, flags, IO_INVIS,
172 172 NULL);
173 173 }
... ... @@ -180,7 +180,7 @@
180 180 size_t len,
181 181 unsigned int flags)
182 182 {
183   - return bhv_vop_splice_write(vn_from_inode(outfilp->f_dentry->d_inode),
  183 + return bhv_vop_splice_write(vn_from_inode(outfilp->f_path.dentry->d_inode),
184 184 pipe, outfilp, ppos, len, flags, 0, NULL);
185 185 }
186 186  
... ... @@ -192,7 +192,7 @@
192 192 size_t len,
193 193 unsigned int flags)
194 194 {
195   - return bhv_vop_splice_write(vn_from_inode(outfilp->f_dentry->d_inode),
  195 + return bhv_vop_splice_write(vn_from_inode(outfilp->f_path.dentry->d_inode),
196 196 pipe, outfilp, ppos, len, flags, IO_INVIS,
197 197 NULL);
198 198 }
... ... @@ -212,7 +212,7 @@
212 212 struct file *filp,
213 213 fl_owner_t id)
214 214 {
215   - return -bhv_vop_close(vn_from_inode(filp->f_dentry->d_inode), 0,
  215 + return -bhv_vop_close(vn_from_inode(filp->f_path.dentry->d_inode), 0,
216 216 file_count(filp) > 1 ? L_FALSE : L_TRUE, NULL);
217 217 }
218 218  
... ... @@ -251,7 +251,7 @@
251 251 unsigned long address,
252 252 int *type)
253 253 {
254   - struct inode *inode = area->vm_file->f_dentry->d_inode;
  254 + struct inode *inode = area->vm_file->f_path.dentry->d_inode;
255 255 bhv_vnode_t *vp = vn_from_inode(inode);
256 256  
257 257 ASSERT_ALWAYS(vp->v_vfsp->vfs_flag & VFS_DMI);
... ... @@ -268,7 +268,7 @@
268 268 filldir_t filldir)
269 269 {
270 270 int error = 0;
271   - bhv_vnode_t *vp = vn_from_inode(filp->f_dentry->d_inode);
  271 + bhv_vnode_t *vp = vn_from_inode(filp->f_path.dentry->d_inode);
272 272 uio_t uio;
273 273 iovec_t iov;
274 274 int eof = 0;
... ... @@ -345,7 +345,7 @@
345 345 vma->vm_ops = &xfs_file_vm_ops;
346 346  
347 347 #ifdef CONFIG_XFS_DMAPI
348   - if (vn_from_inode(filp->f_dentry->d_inode)->v_vfsp->vfs_flag & VFS_DMI)
  348 + if (vn_from_inode(filp->f_path.dentry->d_inode)->v_vfsp->vfs_flag & VFS_DMI)
349 349 vma->vm_ops = &xfs_dmapi_file_vm_ops;
350 350 #endif /* CONFIG_XFS_DMAPI */
351 351  
... ... @@ -360,7 +360,7 @@
360 360 unsigned long p)
361 361 {
362 362 int error;
363   - struct inode *inode = filp->f_dentry->d_inode;
  363 + struct inode *inode = filp->f_path.dentry->d_inode;
364 364 bhv_vnode_t *vp = vn_from_inode(inode);
365 365  
366 366 error = bhv_vop_ioctl(vp, inode, filp, 0, cmd, (void __user *)p);
... ... @@ -382,7 +382,7 @@
382 382 unsigned long p)
383 383 {
384 384 int error;
385   - struct inode *inode = filp->f_dentry->d_inode;
  385 + struct inode *inode = filp->f_path.dentry->d_inode;
386 386 bhv_vnode_t *vp = vn_from_inode(inode);
387 387  
388 388 error = bhv_vop_ioctl(vp, inode, filp, IO_INVIS, cmd, (void __user *)p);
... ... @@ -404,7 +404,7 @@
404 404 struct vm_area_struct *vma,
405 405 unsigned int newflags)
406 406 {
407   - bhv_vnode_t *vp = vn_from_inode(vma->vm_file->f_dentry->d_inode);
  407 + bhv_vnode_t *vp = vn_from_inode(vma->vm_file->f_path.dentry->d_inode);
408 408 int error = 0;
409 409  
410 410 if (vp->v_vfsp->vfs_flag & VFS_DMI) {
fs/xfs/linux-2.6/xfs_ioctl.c
Diff comments   View file @ e678fb0
... ... @@ -107,9 +107,9 @@
107 107 if (!file)
108 108 return -EBADF;
109 109  
110   - ASSERT(file->f_dentry);
111   - ASSERT(file->f_dentry->d_inode);
112   - inode = igrab(file->f_dentry->d_inode);
  110 + ASSERT(file->f_path.dentry);
  111 + ASSERT(file->f_path.dentry->d_inode);
  112 + inode = igrab(file->f_path.dentry->d_inode);
113 113 fput(file);
114 114 break;
115 115 }
116 116  
... ... @@ -333,10 +333,10 @@
333 333 }
334 334  
335 335 /* Ensure umount returns EBUSY on umounts while this file is open. */
336   - mntget(parfilp->f_vfsmnt);
  336 + mntget(parfilp->f_path.mnt);
337 337  
338 338 /* Create file pointer. */
339   - filp = dentry_open(dentry, parfilp->f_vfsmnt, hreq.oflags);
  339 + filp = dentry_open(dentry, parfilp->f_path.mnt, hreq.oflags);
340 340 if (IS_ERR(filp)) {
341 341 put_unused_fd(new_fd);
342 342 return -XFS_ERROR(-PTR_ERR(filp));
fs/xfs/linux-2.6/xfs_ioctl32.c
Diff comments   View file @ e678fb0
... ... @@ -112,7 +112,7 @@
112 112 unsigned cmd,
113 113 unsigned long arg)
114 114 {
115   - struct inode *inode = file->f_dentry->d_inode;
  115 + struct inode *inode = file->f_path.dentry->d_inode;
116 116 bhv_vnode_t *vp = vn_from_inode(inode);
117 117 int error;
118 118  
fs/xfs/linux-2.6/xfs_lrw.c
Diff comments   View file @ e678fb0
... ... @@ -805,7 +805,7 @@
805 805 !capable(CAP_FSETID)) {
806 806 error = xfs_write_clear_setuid(xip);
807 807 if (likely(!error))
808   - error = -remove_suid(file->f_dentry);
  808 + error = -remove_suid(file->f_path.dentry);
809 809 if (unlikely(error)) {
810 810 xfs_iunlock(xip, iolock);
811 811 goto out_unlock_mutex;
... ... @@ -71,7 +71,7 @@
71 71  
72 72 /* Pull information for the target fd */
73 73 if (((fp = fget((int)sxp->sx_fdtarget)) == NULL) ||
74   - ((vp = vn_from_inode(fp->f_dentry->d_inode)) == NULL)) {
  74 + ((vp = vn_from_inode(fp->f_path.dentry->d_inode)) == NULL)) {
75 75 error = XFS_ERROR(EINVAL);
76 76 goto error0;
77 77 }
... ... @@ -83,7 +83,7 @@
83 83 }
84 84  
85 85 if (((tfp = fget((int)sxp->sx_fdtmp)) == NULL) ||
86   - ((tvp = vn_from_inode(tfp->f_dentry->d_inode)) == NULL)) {
  86 + ((tvp = vn_from_inode(tfp->f_path.dentry->d_inode)) == NULL)) {
87 87 error = XFS_ERROR(EINVAL);
88 88 goto error0;
89 89 }