summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2010-12-20 15:53:18 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-20 09:09:57 -0800
commit3cb50ddf97a0a1ca4c68bc12fa1e727a6b45fbf2 (patch)
treed0b6c48e52bcccdd67c0d440a7ac7629404394fd /fs
parentb8da46d3d55807037b58f14621a0949f18053bde (diff)
downloadop-kernel-dev-3cb50ddf97a0a1ca4c68bc12fa1e727a6b45fbf2.zip
op-kernel-dev-3cb50ddf97a0a1ca4c68bc12fa1e727a6b45fbf2.tar.gz
Fix btrfs b0rkage
Buggered-in: 76dda93c6ae2 ("Btrfs: add snapshot/subvolume destroy ioctl") Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Chris Mason <chris.mason@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/export.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c
index 6f04444..659f532 100644
--- a/fs/btrfs/export.c
+++ b/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;
OpenPOWER on IntegriCloud