diff options
| author | James Morris <jmorris@namei.org> | 2011-05-19 10:51:57 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-19 10:51:57 +0200 |
| commit | 12a5a2621b1ee14d32beca35304d7c6076a58815 (patch) | |
| tree | 213e13f99de690b3c4a510f504393b63ada626bd /fs/ceph/snap.c | |
| parent | TOMOYO: Fix wrong domainname validation. (diff) | |
| parent | Linux 2.6.39 (diff) | |
| download | linux-12a5a2621b1ee14d32beca35304d7c6076a58815.tar.xz linux-12a5a2621b1ee14d32beca35304d7c6076a58815.zip | |
Merge branch 'master' into next
Conflicts:
include/linux/capability.h
Manually resolve merge conflict w/ thanks to Stephen Rothwell.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/ceph/snap.c')
| -rw-r--r-- | fs/ceph/snap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index e86ec1155f8f..24067d68a554 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -206,7 +206,7 @@ void ceph_put_snap_realm(struct ceph_mds_client *mdsc, up_write(&mdsc->snap_rwsem); } else { spin_lock(&mdsc->snap_empty_lock); - list_add(&mdsc->snap_empty, &realm->empty_item); + list_add(&realm->empty_item, &mdsc->snap_empty); spin_unlock(&mdsc->snap_empty_lock); } } |