These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / ubifs / misc.h

diff --git a/kernel/fs/ubifs/misc.h b/kernel/fs/ubifs/misc.h
index ee7cb5e..8ece6ca 100644 (file)
--- a/kernel/fs/ubifs/misc.h
+++ b/kernel/fs/ubifs/misc.h
@@ -155,13 +155,8 @@ static inline int ubifs_wbuf_sync(struct ubifs_wbuf *wbuf)
  */
 static inline int ubifs_encode_dev(union ubifs_dev_desc *dev, dev_t rdev)
 {
-       if (new_valid_dev(rdev)) {
-               dev->new = cpu_to_le32(new_encode_dev(rdev));
-               return sizeof(dev->new);
-       } else {
-               dev->huge = cpu_to_le64(huge_encode_dev(rdev));
-               return sizeof(dev->huge);
-       }
+       dev->new = cpu_to_le32(new_encode_dev(rdev));
+       return sizeof(dev->new);
 }
 
 /**