summaryrefslogtreecommitdiffstats
path: root/libglusterfs
diff options
context:
space:
mode:
authorAnand Avati <avati@gluster.com>2010-11-24 07:15:19 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-11-24 06:39:55 -0800
commit9f8edf2b2576a235526087f4fbc5769940f019ad (patch)
tree3476f1f674c6041c3929f2333f553af5dc4f1b89 /libglusterfs
parentab5c5610bb37e5f4fbcc4722abf21de3dc2c9679 (diff)
iatt: fix bug in ia_makedev
the wrong binary operator was resulting in lookup/stat showing wrong major/minor numbers for device files Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 2145 ([3.1.1qa9] mknod does not work properly) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2145
Diffstat (limited to 'libglusterfs')
-rw-r--r--libglusterfs/src/iatt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libglusterfs/src/iatt.h b/libglusterfs/src/iatt.h
index a17e0e7a4..ce4cc495d 100644
--- a/libglusterfs/src/iatt.h
+++ b/libglusterfs/src/iatt.h
@@ -120,7 +120,7 @@ ia_minor (uint64_t ia_dev)
static inline uint64_t
ia_makedev (uint32_t ia_maj, uint32_t ia_min)
{
- return ((((uint64_t) ia_maj) << 32) & ia_min);
+ return ((((uint64_t) ia_maj) << 32) | ia_min);
}