Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] struct path: convert block_drivers

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

authored by

Josef Sipek and committed by
Linus Torvalds
6c648be6 c5a20b6c

+5 -5
+2 -2
drivers/block/acsi_slm.c
··· 363 363 loff_t *ppos ) 364 364 365 365 { 366 - struct inode *node = file->f_dentry->d_inode; 366 + struct inode *node = file->f_path.dentry->d_inode; 367 367 unsigned long page; 368 368 int length; 369 369 int end; ··· 618 618 loff_t *ppos ) 619 619 620 620 { 621 - struct inode *node = file->f_dentry->d_inode; 621 + struct inode *node = file->f_path.dentry->d_inode; 622 622 int device = iminor(node); 623 623 int n, filled, w, h; 624 624
+1 -1
drivers/block/cciss.c
··· 535 535 { 536 536 int ret; 537 537 lock_kernel(); 538 - ret = cciss_ioctl(f->f_dentry->d_inode, f, cmd, arg); 538 + ret = cciss_ioctl(f->f_path.dentry->d_inode, f, cmd, arg); 539 539 unlock_kernel(); 540 540 return ret; 541 541 }
+2 -2
drivers/block/loop.c
··· 1000 1000 1001 1001 if (lo->lo_state != Lo_bound) 1002 1002 return -ENXIO; 1003 - error = vfs_getattr(file->f_vfsmnt, file->f_dentry, &stat); 1003 + error = vfs_getattr(file->f_path.mnt, file->f_path.dentry, &stat); 1004 1004 if (error) 1005 1005 return error; 1006 1006 memset(info, 0, sizeof(*info)); ··· 1287 1287 1288 1288 static long lo_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 1289 1289 { 1290 - struct inode *inode = file->f_dentry->d_inode; 1290 + struct inode *inode = file->f_path.dentry->d_inode; 1291 1291 struct loop_device *lo = inode->i_bdev->bd_disk->private_data; 1292 1292 int err; 1293 1293