diff --git a/[refs] b/[refs] index a1351a7b0616..34429dd0e636 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8da46d3d55807037b58f14621a0949f18053bde +refs/heads/master: 3cb50ddf97a0a1ca4c68bc12fa1e727a6b45fbf2 diff --git a/trunk/fs/btrfs/export.c b/trunk/fs/btrfs/export.c index 6f0444473594..659f532d26a0 100644 --- a/trunk/fs/btrfs/export.c +++ b/trunk/fs/btrfs/export.c @@ -166,7 +166,7 @@ static struct dentry *btrfs_fh_to_dentry(struct super_block *sb, struct fid *fh, static struct dentry *btrfs_get_parent(struct dentry *child) { struct inode *dir = child->d_inode; - static struct dentry *dentry; + struct dentry *dentry; struct btrfs_root *root = BTRFS_I(dir)->root; struct btrfs_path *path; struct extent_buffer *leaf;