[LU-8176] Add file_dentry and file_inode wrappers

• Status: Resolved
• Project: Lustre
• Fix Version/s: Lustre 2.9.0
• Type: Improvement
• Priority: Minor
• Reporter: Oleg Drokin
• Assignee: Yang Sheng
• Resolution: Fixed

Description

When upstream kernel moved to file->f_path.dentry and friends, a couple of very convenient wrappers were added:
file_dentry(file) would return a dentry of the file
file_inode(file) would return inode of the file.

Using those instead of the huge monstrosity we have now is probably better, just need to create compat wrappers for code that does not have it yet.

static inline struct inode *file_inode(const struct file *f)
{       
        return f->f_inode;
}

static inline struct dentry *file_dentry(const struct file *file)
{       
        struct dentry *dentry = file->f_path.dentry;
        
        if (unlikely(dentry->d_flags & DCACHE_OP_REAL))
                return dentry->d_op->d_real(dentry, file_inode(file));
        else    
                return dentry;
}

Issue Links

• is related to: LU-8352 Mellanox/OFED build breakage due to f...

Comments

[Joseph Gmitter (Inactive)]

Hi Yang Sheng,

Would you be able to look into this one?

Thanks.
Joe

[Gerrit Updater]

Yang Sheng ([e-mail]) uploaded a new patch: http://review.whamcloud.com/20576
Subject: LU-8176 libcfs: Add file_dentry&file_inode wrapper
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: a9dbdfc2c350666cf0109dc8b537d086920612a5

[Gerrit Updater]

Oleg Drokin ([e-mail]) merged in patch http://review.whamcloud.com/20576/
Subject: LU-8176 libcfs: Add file_dentry() & file_inode() wrapper
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: b384b414d88de3cfa4966e731b46e85f62c8e438

[Yang Sheng]

Patch landed, Close ticket.

[Chris Horn]

This causes a build regression for us on SLES 11 SP3 against OFED 3.12-1 and OFED 3.18:

[  177s] In file included from /usr/src/packages/BUILD/cray-lustre/libcfs/include/libcfs/linux/libcfs.h:92,
[  177s]                  from /usr/src/packages/BUILD/cray-lustre/libcfs/include/libcfs/libcfs.h:43,
[  177s]                  from /usr/src/packages/BUILD/cray-lustre/lnet/klnds/gnilnd/gnilnd.h:67,
[  177s]                  from /usr/src/packages/BUILD/cray-lustre/lnet/klnds/gnilnd/gnilnd.c:25:
[  177s] /usr/src/packages/BUILD/cray-lustre/libcfs/include/libcfs/linux/linux-fs.h:66: error: conflicting types for 'backport_file_inode'
[  177s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/compat-3.12.h:16: error: previous definition of 'backport_file_inode' was here
[  177s] In file included from /usr/src/packages/BUILD/cray-lustre/libcfs/include/libcfs/linux/libcfs.h:92,
[  177s]                  from /usr/src/packages/BUILD/cray-lustre/libcfs/include/libcfs/libcfs.h:43,
[  177s]                  from /usr/src/packages/BUILD/cray-lustre/lnet/include/lnet/lib-lnet.h:48,
[  177s]                  from /usr/src/packages/BUILD/cray-lustre/lnet/lnet/api-ni.c:39:
[  177s] /usr/src/packages/BUILD/cray-lustre/libcfs/include/libcfs/linux/linux-fs.h:66: error: conflicting types for 'backport_file_inode'
[  177s] /usr/src/kernel-modules-ofed/x86_64/cray_ari_s/include/linux/compat-3.12.h:16: error: previous definition of 'backport_file_inode' was here

[James A Simmons]

Chris their is a fix for this under ticket LU-8352.