On Wed, Nov 14, 2012 at 07:19:43PM +0400, Cyrill Gorcunov wrote: > We will need this helper in the next patch to > provide a file handle for inotify marks in > /proc/pid/fdinfo output. > > The patch is rather providing the way to use inodes > directly when dentry is not available (like in case > of inotify system). Looks OK to me.--b. > > Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> > CC: Pavel Emelyanov <xemul@xxxxxxxxxxxxx> > CC: Oleg Nesterov <oleg@xxxxxxxxxx> > CC: Andrey Vagin <avagin@xxxxxxxxxx> > CC: Al Viro <viro@xxxxxxxxxxxxxxxxxx> > CC: Alexey Dobriyan <adobriyan@xxxxxxxxx> > CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > CC: James Bottomley <jbottomley@xxxxxxxxxxxxx> > CC: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> > CC: Alexey Dobriyan <adobriyan@xxxxxxxxx> > CC: Matthew Helsley <matt.helsley@xxxxxxxxx> > CC: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> > CC: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx> > CC: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxx> > --- > fs/exportfs/expfs.c | 19 ++++++++++++++----- > include/linux/exportfs.h | 2 ++ > 2 files changed, 16 insertions(+), 5 deletions(-) > Index: linux-2.6.git/fs/exportfs/expfs.c > =================================================================== > --- linux-2.6.git.orig/fs/exportfs/expfs.c > +++ linux-2.6.git/fs/exportfs/expfs.c > @@ -341,10 +341,21 @@ static int export_encode_fh(struct inode > return type; > } > > +int exportfs_encode_inode_fh(struct inode *inode, struct fid *fid, > + int *max_len, struct inode *parent) > +{ > + const struct export_operations *nop = inode->i_sb->s_export_op; > + > + if (nop && nop->encode_fh) > + return nop->encode_fh(inode, fid->raw, max_len, parent); > + > + return export_encode_fh(inode, fid, max_len, parent); > +} > +EXPORT_SYMBOL_GPL(exportfs_encode_inode_fh); > + > int exportfs_encode_fh(struct dentry *dentry, struct fid *fid, int *max_len, > int connectable) > { > - const struct export_operations *nop = dentry->d_sb->s_export_op; > int error; > struct dentry *p = NULL; > struct inode *inode = dentry->d_inode, *parent = NULL; > @@ -357,10 +368,8 @@ int exportfs_encode_fh(struct dentry *de > */ > parent = p->d_inode; > } > - if (nop && nop->encode_fh) > - error = nop->encode_fh(inode, fid->raw, max_len, parent); > - else > - error = export_encode_fh(inode, fid, max_len, parent); > + > + error = exportfs_encode_inode_fh(inode, fid, max_len, parent); > dput(p); > > return error; > Index: linux-2.6.git/include/linux/exportfs.h > =================================================================== > --- linux-2.6.git.orig/include/linux/exportfs.h > +++ linux-2.6.git/include/linux/exportfs.h > @@ -177,6 +177,8 @@ struct export_operations { > int (*commit_metadata)(struct inode *inode); > }; > > +extern int exportfs_encode_inode_fh(struct inode *inode, struct fid *fid, > + int *max_len, struct inode *parent); > extern int exportfs_encode_fh(struct dentry *dentry, struct fid *fid, > int *max_len, int connectable); > extern struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid, > -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html