diff --git a/[refs] b/[refs] index 4cce3b08c7c8..b89fd3be8b28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6ffe10015f4e6fba8a915318b319c43aed1836f +refs/heads/master: 7fd7d101ff50af55d6d69f4705facc00c324024e diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c index b4c3efa163c2..264ab701154f 100644 --- a/trunk/fs/ceph/mds_client.c +++ b/trunk/fs/ceph/mds_client.c @@ -619,7 +619,7 @@ static void __unregister_request(struct ceph_mds_client *mdsc, * * Called under mdsc->mutex. */ -struct dentry *get_nonsnap_parent(struct dentry *dentry) +static struct dentry *get_nonsnap_parent(struct dentry *dentry) { /* * we don't need to worry about protecting the d_parent access @@ -3154,7 +3154,7 @@ void ceph_mdsc_sync(struct ceph_mds_client *mdsc) /* * true if all sessions are closed, or we force unmount */ -bool done_closing_sessions(struct ceph_mds_client *mdsc) +static bool done_closing_sessions(struct ceph_mds_client *mdsc) { int i, n = 0;