diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 20:09:49 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 20:09:49 +0100 |
| commit | 42a9fa9957e369240936891c9a521ab671eed4e7 (patch) | |
| tree | 7a9367594a367085c6a4a4433f687ec5c8dac8b7 /fs/fuse/dir.c | |
| parent | spi: Enable SPI driver for S5P6440 and S5P6450 (diff) | |
| parent | mmc: sdhci-of: fix build on non-powerpc platforms (diff) | |
| download | linux-42a9fa9957e369240936891c9a521ab671eed4e7.tar.xz linux-42a9fa9957e369240936891c9a521ab671eed4e7.zip | |
Merge branch 'devicetree/next' into spi/next
Diffstat (limited to 'fs/fuse/dir.c')
| -rw-r--r-- | fs/fuse/dir.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 042af7346ec1..bfed8447ed80 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -350,7 +350,6 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry, } entry = newent ? newent : entry; - d_set_d_op(entry, &fuse_dentry_operations); if (outarg_valid) fuse_change_entry_timeout(entry, &outarg); else |