Skip to contentSkip to conversation

ocfs2-1.6: Use filep_dentry in compat_ctl.

PATCH New Tao Ma 2 participants 2 messages Feb 10, 2010 – Feb 12, 2010 OCFS2

lore
Share & tools
lore

Tao Ma

author
#0 lore raw

PATCH 1/1 ocfs2-1.6: Use filep_dentry in compat_ctl.

17fb03bb01b4ae34643b16f2029049e5bab350e is backported from mainline, but the structure has changed somehow since 2.6.18. So get inode like we do in ioctl.

---
 fs/ocfs2/ioctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ocfs2/ioctl.c +1 -1
index 1d3f828..56dba61 100644
@@ -184,7 +184,7 @@ long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 {
 	bool preserve;
 	struct reflink_arguments args;
-	struct inode *inode = file->f_path.dentry->d_inode;
+	struct inode *inode = filp_dentry(file)->d_inode;
 
 	switch (cmd) {
 	case OCFS2_IOC32_GETFLAGS:
Signature · 1 line
1.5.5
#1 lore raw

PATCH 1/1 ocfs2-1.6: Use filep_dentry in compat_ctl.

Quoted 15 lines · Tao Ma

17fb03bb01b4ae34643b16f2029049e5bab350e is backported from mainline, but the structure has changed somehow since 2.6.18. So get inode like we do in ioctl.

---
 fs/ocfs2/ioctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ocfs2/ioctl.c +0 -0
index 1d3f828..56dba61 100644

fs/ocfs2/ioctl.c long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg) · line 190

Quoted 8 lines
fs/ocfs2/ioctl.c +1 -1
@@ -184,7 +184,7 @@ long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 {
 	bool preserve;
 	struct reflink_arguments args;
-	struct inode *inode = file->f_path.dentry->d_inode;
+	struct inode *inode = filp_dentry(file)->d_inode;
 
 	switch (cmd) {
 	case OCFS2_IOC32_GETFLAGS:

Checked-in.