diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-10 23:32:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-10 23:32:28 -0500 |
| commit | d5ef8a4d87ab21d575ac86366599c9152a28028d (patch) | |
| tree | 8b1be85ad1af7ee6a0e3e36c77ae738c966c1f21 /net/ceph/ceph_common.c | |
| parent | d9dd966d7fc088a6bed991c2b1e2fba4485e0a31 (diff) | |
| parent | 8df54d622a120058ee8bec38743c9b8f091c8e58 (diff) | |
| download | lwn-d5ef8a4d87ab21d575ac86366599c9152a28028d.tar.gz lwn-d5ef8a4d87ab21d575ac86366599c9152a28028d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/nes/nes_cm.c
Simple whitespace conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ceph/ceph_common.c')
| -rw-r--r-- | net/ceph/ceph_common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index 97f70e50ad3b..761ad9d6cc3b 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c @@ -85,8 +85,6 @@ int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid) } else { pr_info("client%lld fsid %pU\n", ceph_client_id(client), fsid); memcpy(&client->fsid, fsid, sizeof(*fsid)); - ceph_debugfs_client_init(client); - client->have_fsid = true; } return 0; } |