git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
fs
/
ceph
/
super.c
diff --git
a/fs/ceph/super.c
b/fs/ceph/super.c
index 2516304379d30dbb319a77375c5f06dc4ef9fa20..33ba6f0aa55ce7d24bb281d2e6a2d32115fece80 100644
(file)
--- a/
fs/ceph/super.c
+++ b/
fs/ceph/super.c
@@
-104,8
+104,7
@@
static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf)
le64_to_cpu(*((__le64 *)&monc->monmap->fsid + 1));
mutex_unlock(&monc->mutex);
- buf->f_fsid.val[0] = fsid & 0xffffffff;
- buf->f_fsid.val[1] = fsid >> 32;
+ buf->f_fsid = u64_to_fsid(fsid);
return 0;
}