mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
->encode_fh() API change
pass inode + parent's inode or NULL instead of dentry + bool saying whether we want the parent or not. NOTE: that needs ceph fix folded in. Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
6d42e7e9f6
commit
b0b0382bb4
16 changed files with 94 additions and 140 deletions
|
|
@ -752,10 +752,9 @@ static struct dentry *fat_fh_to_dentry(struct super_block *sb,
|
|||
}
|
||||
|
||||
static int
|
||||
fat_encode_fh(struct dentry *de, __u32 *fh, int *lenp, int connectable)
|
||||
fat_encode_fh(struct inode *inode, __u32 *fh, int *lenp, struct inode *parent)
|
||||
{
|
||||
int len = *lenp;
|
||||
struct inode *inode = de->d_inode;
|
||||
u32 ipos_h, ipos_m, ipos_l;
|
||||
|
||||
if (len < 5) {
|
||||
|
|
@ -771,9 +770,9 @@ fat_encode_fh(struct dentry *de, __u32 *fh, int *lenp, int connectable)
|
|||
fh[1] = inode->i_generation;
|
||||
fh[2] = ipos_h;
|
||||
fh[3] = ipos_m | MSDOS_I(inode)->i_logstart;
|
||||
spin_lock(&de->d_lock);
|
||||
fh[4] = ipos_l | MSDOS_I(de->d_parent->d_inode)->i_logstart;
|
||||
spin_unlock(&de->d_lock);
|
||||
fh[4] = ipos_l;
|
||||
if (parent)
|
||||
fh[4] |= MSDOS_I(parent)->i_logstart;
|
||||
return 3;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue