diff --git a/[refs] b/[refs] index 7e94614ee1f0..ea2df68bcfd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dba92d3bc49c036056a48661d2d8fefe4c78375a +refs/heads/master: 9b89ca7a3847c0d5b1e86e83f4860a866f28a89b diff --git a/trunk/include/linux/exportfs.h b/trunk/include/linux/exportfs.h index 51d214138814..adcbb05b120b 100644 --- a/trunk/include/linux/exportfs.h +++ b/trunk/include/linux/exportfs.h @@ -49,11 +49,11 @@ struct fid { /** * struct export_operations - for nfsd to communicate with file systems - * @decode_fh: decode a file handle fragment and return a &struct dentry * @encode_fh: encode a file handle fragment from a dentry + * @fh_to_dentry: find the implied object and get a dentry for it + * @fh_to_parent: find the implied object's parent and get a dentry for it * @get_name: find the name for a given inode in a given directory * @get_parent: find the parent of a given directory - * @get_dentry: find a dentry for the inode given a file handle sub-fragment * * See Documentation/filesystems/Exporting for details on how to use * this interface correctly.