diff options
| author | David S. Miller <davem@davemloft.net> | 2015-09-26 23:08:27 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-26 23:08:27 (GMT) |
| commit | 4963ed48f2c20196d51a447ee87dc2815584fee4 (patch) | |
| tree | a1902f466dafa00453889a4f1e66b00249ce0529 /fs/ceph/snap.c | |
| parent | 4d54d86546f62c7c4a0fe3b36a64c5e3b98ce1a9 (diff) | |
| parent | 518a7cb6980cd640c7f979d29021ad870f60d7d7 (diff) | |
| download | linux-4963ed48f2c20196d51a447ee87dc2815584fee4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/arp.c
The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/ceph/snap.c')
| -rw-r--r-- | fs/ceph/snap.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index 233d906a..4aa7122 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -338,12 +338,6 @@ static int build_snap_context(struct ceph_snap_realm *realm) return 0; } - if (num == 0 && realm->seq == ceph_empty_snapc->seq) { - ceph_get_snap_context(ceph_empty_snapc); - snapc = ceph_empty_snapc; - goto done; - } - /* alloc new snap context */ err = -ENOMEM; if (num > (SIZE_MAX - sizeof(*snapc)) / sizeof(u64)) @@ -381,7 +375,6 @@ static int build_snap_context(struct ceph_snap_realm *realm) realm->ino, realm, snapc, snapc->seq, (unsigned int) snapc->num_snaps); -done: ceph_put_snap_context(realm->cached_context); realm->cached_context = snapc; return 0; |