[PATCH] fs/locks.c: remove MSNFS define

• Next message: idalton@ferret.dyndns.org: "Re: 3dfx framebuffer driver borked in 2.5.19 kernel"
• Previous message: dean gaudet: "Re: Linux 2.4.19-pre10-ac2"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This patch removes the MSNFS defines. These locks have a wider purpose
than emulating Microsoft NFS semantics.

--- fs/locks.c2 Thu Jun 6 11:25:15 2002
+++ fs/locks.c3 Thu Jun 6 11:44:03 2002
@@ -1,4 +1,3 @@
-#define MSNFS /* HACK HACK */
 /*
  * linux/fs/locks.c
  *
@@ -576,10 +575,8 @@
          */
         if (!IS_FLOCK(sys_fl) || (caller_fl->fl_file == sys_fl->fl_file))
                 return (0);
-#ifdef MSNFS
         if ((caller_fl->fl_type & LOCK_MAND) || (sys_fl->fl_type & LOCK_MAND))
                 return 0;
-#endif
 
         return (locks_conflict(caller_fl, sys_fl));
 }
@@ -1029,10 +1026,8 @@
 }
 
 static inline int flock_translate_cmd(int cmd) {
-#ifdef MSNFS
         if (cmd & LOCK_MAND)
                 return cmd & (LOCK_MAND | LOCK_RW);
-#endif
         switch (cmd &~ LOCK_NB) {
         case LOCK_SH:
                 return F_RDLCK;
@@ -1325,11 +1320,7 @@
         type = error;
 
         error = -EBADF;
- if ((type != F_UNLCK)
-#ifdef MSNFS
- && !(type & LOCK_MAND)
-#endif
- && !(filp->f_mode & 3))
+ if ((type != F_UNLCK) && !(type & LOCK_MAND) && !(filp->f_mode & 3))
                 goto out_putf;
 
         lock_kernel();
@@ -1718,27 +1709,25 @@
                               (inode->i_mode & (S_IXGRP | S_ISGID)) == S_ISGID) ?
                              "MANDATORY" : "ADVISORY ");
         } else if (IS_FLOCK(fl)) {
-#ifdef MSNFS
                 if (fl->fl_type & LOCK_MAND) {
                         out += sprintf(out, "FLOCK MSNFS ");
- } else
-#endif
+ } else {
                         out += sprintf(out, "FLOCK ADVISORY ");
+ }
         } else if (IS_LEASE(fl)) {
                 out += sprintf(out, "LEASE MANDATORY ");
         } else {
                 out += sprintf(out, "UNKNOWN UNKNOWN ");
         }
-#ifdef MSNFS
         if (fl->fl_type & LOCK_MAND) {
                 out += sprintf(out, "%s ",
                                (fl->fl_type & LOCK_READ)
                                ? (fl->fl_type & LOCK_WRITE) ? "RW " : "READ "
                                : (fl->fl_type & LOCK_WRITE) ? "WRITE" : "NONE ");
- } else
-#endif
+ } else {
                 out += sprintf(out, "%s ",
                                (fl->fl_type & F_WRLCK) ? "WRITE" : "READ ");
+ }
         out += sprintf(out, "%d %s:%ld ",
                      fl->fl_pid,
                      inode ? kdevname(inode->i_dev) : "<none>",
@@ -1818,7 +1807,6 @@
         return length;
 }
 
-#ifdef MSNFS
 /**
  * lock_may_read - checks that the region is free of locks
  * @inode: the inode that is being read
@@ -1892,7 +1880,6 @@
         unlock_kernel();
         return result;
 }
-#endif
 
 static int __init filelock_init(void)
 {

-- 
Revolutions do not require corporate support.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

• Next message: idalton@ferret.dyndns.org: "Re: 3dfx framebuffer driver borked in 2.5.19 kernel"
• Previous message: dean gaudet: "Re: Linux 2.4.19-pre10-ac2"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Fri Jun 07 2002 - 22:00:28 EST