| [2288] | 1 | commit 407e7c90a97143d436ad3a6af6bbfa431c849191 |
|---|
| 2 | Author: Marc Dionne <marc.c.dionne@gmail.com> |
|---|
| 3 | Date: Sat Jun 2 21:35:53 2012 -0400 |
|---|
| 4 | |
|---|
| 5 | Linux 3.5: encode_fh API change |
|---|
| 6 | |
|---|
| 7 | The encode_fh export operation now expects two inode arguments |
|---|
| 8 | instead of a dentry and a "connectable" flag. Use the inode of |
|---|
| 9 | the dentry we're interested in, and NULL as the parent inode which |
|---|
| 10 | is the same as passing a 0 flag in the previous API. |
|---|
| 11 | |
|---|
| 12 | Change-Id: I05cf146fb2a4bacdca20a9f108d04ccb11530804 |
|---|
| 13 | Reviewed-on: http://gerrit.openafs.org/7523 |
|---|
| 14 | Tested-by: BuildBot <buildbot@rampaginggeek.com> |
|---|
| 15 | Reviewed-by: Derrick Brashear <shadow@dementix.org> |
|---|
| 16 | (cherry picked from commit 5227148ae17949705487ea673d558ebfe143e635) |
|---|
| 17 | Reviewed-on: http://gerrit.openafs.org/7579 |
|---|
| 18 | |
|---|
| 19 | --- a/src/afs/LINUX/osi_compat.h |
|---|
| 20 | +++ b/src/afs/LINUX/osi_compat.h |
|---|
| 21 | @@ -333,7 +333,7 @@ afs_get_dentry_from_fh(struct super_block *afs_cacheSBp, afs_dcache_id_t *ainode |
|---|
| 22 | static inline int |
|---|
| 23 | afs_get_fh_from_dentry(struct dentry *dp, afs_ufs_dcache_id_t *ainode, int *max_lenp) { |
|---|
| 24 | if (dp->d_sb->s_export_op->encode_fh) |
|---|
| 25 | + return dp->d_sb->s_export_op->encode_fh(dp->d_inode, &ainode->raw[0], max_lenp, NULL); |
|---|
| 26 | - return dp->d_sb->s_export_op->encode_fh(dp, &ainode->raw[0], max_lenp, 0); |
|---|
| 27 | #if defined(NEW_EXPORT_OPS) |
|---|
| 28 | /* If fs doesn't provide an encode_fh method, assume the default INO32 type */ |
|---|
| 29 | *max_lenp = sizeof(struct fid)/4; |
|---|
