1. 21 10月, 2010 3 次提交
  2. 03 10月, 2010 1 次提交
    • J
      nfsd4: return expired on unfound stateid's · 33515142
      J. Bruce Fields 提交于
      Commit 78155ed7 "nfsd4: distinguish
      expired from stale stateids" attempted to distinguish expired and stale
      stateid's using time information that may not have been completely
      reliable, so I reverted it.
      
      That was throwing out the baby with the bathwater; we still do want to
      return expired, but let's do that using the simpler approach of just
      assuming any stateid is expired if it looks like it was given out by the
      current server instance, but we can't find it any more.
      
      This may help clients that are recovering from network partitions.
      Reported-by: NBian Naimeng <biannm@cn.fujitsu.com>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      33515142
  3. 02 10月, 2010 10 次提交
  4. 03 9月, 2010 1 次提交
  5. 27 8月, 2010 2 次提交
    • J
      nfsd4: fix downgrade/lock logic · 7d947842
      J. Bruce Fields 提交于
      If we already had a RW open for a file, and get a readonly open, we were
      piggybacking on the existing RW open.  That's inconsistent with the
      downgrade logic which blows away the RW open assuming you'll still have
      a readonly open.
      
      Also, make sure there is a readonly or writeonly open available for
      locking, again to prevent bad behavior in downgrade cases when any RW
      open may be lost.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      7d947842
    • J
      nfsd4: bad BUG() in preprocess_stateid_op · 30c0e1ef
      J. Bruce Fields 提交于
      It's OK for this function to return without setting filp--we do it in
      the special-stateid case.
      
      And there's a legitimate case where we can hit this, since we do permit
      reads on write-only stateid's.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      30c0e1ef
  6. 07 8月, 2010 1 次提交
  7. 30 7月, 2010 5 次提交
    • A
      gcc-4.6: nfsd: fix initialized but not read warnings · 69049961
      Andi Kleen 提交于
      Fixes at least one real minor bug: the nfs4 recovery dir sysctl
      would not return its status properly.
      
      Also I finished Al's 1e41568d ("Take ima_path_check() in nfsd
      past dentry_open() in nfsd_open()") commit, it moved the IMA
      code, but left the old path initializer in there.
      
      The rest is just dead code removed I think, although I was not
      fully sure about the "is_borc" stuff. Some more review
      would be still good.
      
      Found by gcc 4.6's new warnings.
      Signed-off-by: NAndi Kleen <ak@linux.intel.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Neil Brown <neilb@suse.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      69049961
    • J
      nfsd4: share file descriptors between stateid's · f9d7562f
      J. Bruce Fields 提交于
      The vfs doesn't really allow us to "upgrade" a file descriptor from
      read-only to read-write, and our attempt to do so in nfs4_upgrade_open
      is ugly and incomplete.
      
      Move to a different scheme where we keep multiple opens, shared between
      open stateid's, in the nfs4_file struct.  Each file will be opened at
      most 3 times (for read, write, and read-write), and those opens will be
      shared between all clients and openers.  On upgrade we will do another
      open if necessary instead of attempting to upgrade an existing open.
      We keep count of the number of readers and writers so we know when to
      close the shared files.
      Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>
      f9d7562f
    • J
      nfsd4: fix openmode checking on IO using lock stateid · 02921914
      J. Bruce Fields 提交于
      It is legal to perform a write using the lock stateid that was
      originally associated with a read lock, or with a file that was
      originally opened for read, but has since been upgraded.
      
      So, when checking the openmode, check the mode associated with the
      open stateid from which the lock was derived.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      02921914
    • J
      nfsd4: miscellaneous process_open2 cleanup · 21fb4016
      J. Bruce Fields 提交于
      Move more work into helper functions.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      21fb4016
    • J
      nfsd4: don't pretend to support write delegations · c3e48080
      J. Bruce Fields 提交于
      The delegation code mostly pretends to support either read or write
      delegations.  However, correct support for write delegations would
      require, for example, breaking of delegations (and/or implementation of
      cb_getattr) on stat.  Currently all that stops us from handing out
      delegations is a subtle reference-counting issue.
      
      Avoid confusion by adding an earlier check that explicitly refuses write
      delegations.
      
      For now, though, I'm not going so far as to rip out existing
      half-support for write delegations, in case we get around to using that
      soon.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      c3e48080
  8. 23 7月, 2010 1 次提交
    • J
      nfsd4: fix v4 state shutdown error paths · 4ad9a344
      Jeff Layton 提交于
      If someone tries to shut down the laundry_wq while it isn't up it'll
      cause an oops.
      
      This can happen because write_ports can create a nfsd_svc before we
      really start the nfs server, and we may fail before the server is ever
      started.
      
      Also make sure state is shutdown on error paths in nfsd_svc().
      
      Use a common global nfsd_up flag instead of nfs4_init, and create common
      helper functions for nfsd start/shutdown, as there will be other work
      that we want done only when we the number of nfsd threads transitions
      between zero and nonzero.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      4ad9a344
  9. 23 6月, 2010 3 次提交
  10. 09 6月, 2010 1 次提交
  11. 01 6月, 2010 1 次提交
  12. 19 5月, 2010 2 次提交
    • J
      Revert "nfsd4: distinguish expired from stale stateids" · e4e83ea4
      J. Bruce Fields 提交于
      This reverts commit 78155ed7.
      
      We're depending here on the boot time that we use to generate the
      stateid being monotonic, but get_seconds() is not necessarily.
      
      We still depend at least on boot_time being different every time, but
      that is a safer bet.
      
      We have a few reports of errors that might be explained by this problem,
      though we haven't been able to confirm any of them.
      
      But the minor gain of distinguishing expired from stale errors seems not
      worth the risk.
      
      Conflicts:
      
      	fs/nfsd/nfs4state.c
      Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>
      e4e83ea4
    • P
      nfsd: safer initialization order in find_file() · 47cee541
      Pavel Emelyanov 提交于
      The alloc_init_file() first adds a file to the hash and then
      initializes its fi_inode, fi_id and fi_had_conflict.
      
      The uninitialized fi_inode could thus be erroneously checked by
      the find_file(), so move the hash insertion lower.
      
      The client_mutex should prevent this race in practice; however, we
      eventually hope to make less use of the client_mutex, so the ordering
      here is an accident waiting to happen.
      
      I didn't find whether the same can be true for two other fields,
      but the common sense tells me it's better to initialize an object
      before putting it into a global hash table :)
      Signed-off-by: NPavel Emelyanov <xemul@openvz.org>
      Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>
      47cee541
  13. 14 5月, 2010 1 次提交
  14. 13 5月, 2010 4 次提交
  15. 12 5月, 2010 4 次提交