projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
orangefs: rename orangefs_inode_getattr to orangefs_inode_old_getattr
[cascardo/linux.git]
/
fs
/
ceph
/
snap.c
diff --git
a/fs/ceph/snap.c
b/fs/ceph/snap.c
index
233d906
..
4aa7122
100644
(file)
--- 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;
}
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))
/* 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);
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;
ceph_put_snap_context(realm->cached_context);
realm->cached_context = snapc;
return 0;