* nfsd changes for 3.6
@ 2012-07-31 14:29 ` J. Bruce Fields
0 siblings, 0 replies; 6+ messages in thread
From: J. Bruce Fields @ 2012-07-31 14:29 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-nfs, linux-fsdevel, linux-kernel
Please pull nfsd (and some lockd and a couple locks/lease) changes from:
git://linux-nfs.org/~bfields/linux.git nfsd-next
This has been an unusually quiet cycle--mostly bugfixes and cleanup.
The one large piece is Stanislav's work to containerize the server's
grace period--but that in itself is just one more step in a
not-yet-complete project to allow fully containerized nfs service.
There are a number of outstanding delegation, container, v4 state, and
gss patches that aren't quite ready yet; 3.7 may be wilder.
--b.
----------------------------------------------------------------
Chuck Lever (1):
NFSD: TEST_STATEID should not return NFS4ERR_STALE_STATEID
Eldad Zack (2):
sunrpc/cache.h: fix coding style
sunrpc/cache.h: replace simple_strtoul
Filipe Brandenburger (1):
locks: prevent side-effects of locks_release_private before file_lock is initialized
J. Bruce Fields (10):
nfsd4: remove unnecessary comment
nfsd4: nfsd4_lock() cleanup
nfsd4: process_open2 cleanup
nfsd4: our filesystems are normally case sensitive
nfsd4: release openowners on free in >=4.1 case
nfsd: allow owner_override only for regular files
nfsd: share some function prototypes
nfsd: add get_uint for u32's
locks: move lease-specific code out of locks_delete_lock
nfsd4: fix missing fault_inject.h include
NeilBrown (1):
SUNRPC/cache: fix reporting of expired cache entries in 'content' file.
Stanislav Kinsbursky (18):
NFSd: fix locking in nfsd_forget_delegations()
NFSd: introduce nfsd_destroy() helper
NFSd: set nfsd_serv to NULL after service destruction
LockD: mark host per network namespace on garbage collect
LockD: make garbage collector network namespace aware.
LockD: manage garbage collection timeout per networks namespace
LockD: manage used host count per networks namespace
Lockd: host complaining function introduced
Lockd: add more debug to host shutdown functions
LockD: manage grace period per network namespace
LockD: make lockd manager allocated per network namespace
NFSd: make nfsd4_manager allocated per network namespace context.
SUNRPC: service request network namespace helper introduced
LockD: manage grace list per network namespace
LockD: pass actual network namespace to grace period management functions
Lockd: move grace period management from lockd() to per-net functions
NFSd: make grace end flag per network namespace
NFSd: make boot_time variable per network namespace
Vivek Trivedi (1):
nfsd4: fix cr_principal comparison check in same_creds
Weston Andros Adamson (1):
nfsd: probe the back channel on new connections
fs/lockd/grace.c | 16 ++--
fs/lockd/host.c | 92 ++++++++++++-------
fs/lockd/netns.h | 7 ++
fs/lockd/svc.c | 43 +++++----
fs/lockd/svc4proc.c | 13 +--
fs/lockd/svclock.c | 16 ++--
fs/lockd/svcproc.c | 15 ++--
fs/lockd/svcsubs.c | 19 ++--
fs/locks.c | 28 +++---
fs/nfs/callback_xdr.c | 4 +-
fs/nfsd/export.c | 10 +--
fs/nfsd/netns.h | 4 +
fs/nfsd/nfs4callback.c | 1 -
fs/nfsd/nfs4idmap.c | 4 +-
fs/nfsd/nfs4proc.c | 18 ++--
fs/nfsd/nfs4state.c | 201 +++++++++++++++++++++++++-----------------
fs/nfsd/nfs4xdr.c | 2 +-
fs/nfsd/nfsctl.c | 8 +-
fs/nfsd/nfsd.h | 13 +++
fs/nfsd/nfssvc.c | 24 ++---
fs/nfsd/state.h | 5 +-
fs/nfsd/vfs.c | 10 ++-
include/linux/fs.h | 5 +-
include/linux/lockd/lockd.h | 6 +-
include/linux/sunrpc/cache.h | 34 +++++--
include/linux/sunrpc/svc.h | 2 +
net/sunrpc/cache.c | 5 +-
27 files changed, 368 insertions(+), 237 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* nfsd changes for 3.6 @ 2012-07-31 14:29 ` J. Bruce Fields 0 siblings, 0 replies; 6+ messages in thread From: J. Bruce Fields @ 2012-07-31 14:29 UTC (permalink / raw) To: Linus Torvalds Cc: linux-nfs-u79uwXL29TY76Z2rM5mHXA, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA Please pull nfsd (and some lockd and a couple locks/lease) changes from: git://linux-nfs.org/~bfields/linux.git nfsd-next This has been an unusually quiet cycle--mostly bugfixes and cleanup. The one large piece is Stanislav's work to containerize the server's grace period--but that in itself is just one more step in a not-yet-complete project to allow fully containerized nfs service. There are a number of outstanding delegation, container, v4 state, and gss patches that aren't quite ready yet; 3.7 may be wilder. --b. ---------------------------------------------------------------- Chuck Lever (1): NFSD: TEST_STATEID should not return NFS4ERR_STALE_STATEID Eldad Zack (2): sunrpc/cache.h: fix coding style sunrpc/cache.h: replace simple_strtoul Filipe Brandenburger (1): locks: prevent side-effects of locks_release_private before file_lock is initialized J. Bruce Fields (10): nfsd4: remove unnecessary comment nfsd4: nfsd4_lock() cleanup nfsd4: process_open2 cleanup nfsd4: our filesystems are normally case sensitive nfsd4: release openowners on free in >=4.1 case nfsd: allow owner_override only for regular files nfsd: share some function prototypes nfsd: add get_uint for u32's locks: move lease-specific code out of locks_delete_lock nfsd4: fix missing fault_inject.h include NeilBrown (1): SUNRPC/cache: fix reporting of expired cache entries in 'content' file. Stanislav Kinsbursky (18): NFSd: fix locking in nfsd_forget_delegations() NFSd: introduce nfsd_destroy() helper NFSd: set nfsd_serv to NULL after service destruction LockD: mark host per network namespace on garbage collect LockD: make garbage collector network namespace aware. LockD: manage garbage collection timeout per networks namespace LockD: manage used host count per networks namespace Lockd: host complaining function introduced Lockd: add more debug to host shutdown functions LockD: manage grace period per network namespace LockD: make lockd manager allocated per network namespace NFSd: make nfsd4_manager allocated per network namespace context. SUNRPC: service request network namespace helper introduced LockD: manage grace list per network namespace LockD: pass actual network namespace to grace period management functions Lockd: move grace period management from lockd() to per-net functions NFSd: make grace end flag per network namespace NFSd: make boot_time variable per network namespace Vivek Trivedi (1): nfsd4: fix cr_principal comparison check in same_creds Weston Andros Adamson (1): nfsd: probe the back channel on new connections fs/lockd/grace.c | 16 ++-- fs/lockd/host.c | 92 ++++++++++++------- fs/lockd/netns.h | 7 ++ fs/lockd/svc.c | 43 +++++---- fs/lockd/svc4proc.c | 13 +-- fs/lockd/svclock.c | 16 ++-- fs/lockd/svcproc.c | 15 ++-- fs/lockd/svcsubs.c | 19 ++-- fs/locks.c | 28 +++--- fs/nfs/callback_xdr.c | 4 +- fs/nfsd/export.c | 10 +-- fs/nfsd/netns.h | 4 + fs/nfsd/nfs4callback.c | 1 - fs/nfsd/nfs4idmap.c | 4 +- fs/nfsd/nfs4proc.c | 18 ++-- fs/nfsd/nfs4state.c | 201 +++++++++++++++++++++++++----------------- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/nfsctl.c | 8 +- fs/nfsd/nfsd.h | 13 +++ fs/nfsd/nfssvc.c | 24 ++--- fs/nfsd/state.h | 5 +- fs/nfsd/vfs.c | 10 ++- include/linux/fs.h | 5 +- include/linux/lockd/lockd.h | 6 +- include/linux/sunrpc/cache.h | 34 +++++-- include/linux/sunrpc/svc.h | 2 + net/sunrpc/cache.c | 5 +- 27 files changed, 368 insertions(+), 237 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: nfsd changes for 3.6 2012-07-31 14:29 ` J. Bruce Fields (?) @ 2012-07-31 14:36 ` J. Bruce Fields 2012-07-31 21:54 ` Linus Torvalds -1 siblings, 1 reply; 6+ messages in thread From: J. Bruce Fields @ 2012-07-31 14:36 UTC (permalink / raw) To: Linus Torvalds; +Cc: linux-nfs, linux-fsdevel, linux-kernel, viro, matthew On Tue, Jul 31, 2012 at 10:29:48AM -0400, bfields wrote: > Please pull nfsd (and some lockd and a couple locks/lease) changes from: By the way, for a few years now I've been semi-regularly picking up locks.c changes for my tree. I wonder if I should be. At the least we should probably remove this entry from MAINTAINERS? And by default I suppose that stuff reverts to Al, who rumor has it will have a fair number of locks.c patches next time around. Or I'm happy to claim to be maintainer of that file if somebody prefers, it doesn't matter much to me. --b. diff --git a/MAINTAINERS b/MAINTAINERS index 3e30a3a..305ac2c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2767,15 +2767,6 @@ F: include/scsi/fc/ F: include/scsi/libfc.h F: include/scsi/libfcoe.h -FILE LOCKING (flock() and fcntl()/lockf()) -M: Matthew Wilcox <matthew@wil.cx> -L: linux-fsdevel@vger.kernel.org -S: Maintained -F: include/linux/fcntl.h -F: include/linux/fs.h -F: fs/fcntl.c -F: fs/locks.c - FILESYSTEMS (VFS and infrastructure) M: Alexander Viro <viro@zeniv.linux.org.uk> L: linux-fsdevel@vger.kernel.org ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: nfsd changes for 3.6 @ 2012-07-31 21:54 ` Linus Torvalds 0 siblings, 0 replies; 6+ messages in thread From: Linus Torvalds @ 2012-07-31 21:54 UTC (permalink / raw) To: J. Bruce Fields; +Cc: linux-nfs, linux-fsdevel, linux-kernel, viro, matthew On Tue, Jul 31, 2012 at 7:36 AM, J. Bruce Fields <bfields@fieldses.org> wrote: > > By the way, for a few years now I've been semi-regularly picking up > locks.c changes for my tree. I wonder if I should be. I really wish you didn't. Or at least not this way. For example, now you removed that lm_release_private case, but you did that without apparently talking to any VFS maintainers. And the commit seems to be pure shit. Why is it pure shit? Look at what users are left. THERE ARE NO USERS THAT SET THAT FIELD ANY MORE! Maybe I missed some odd user that somehow avoids the grep, but I don't think so. So there is nothing that ever sets it, why the hell does the thing still remain at all? So if this is a real bugfix, then I think it damn well should (a) at a minimum have been discussed with VFS maintainers (b) have been thought through a bit more (ie remove all remains of that now useless lm_release_private field) (c) likely never have gone through the NFSD tree in any case. I've pulled the changes for now, but I absolutely *detest* seeing things like this. I care very little about the nfsd code, but I care deeply when I see insanity happening in the VFS layer. And right now, "lm_release_private" is insane as of this pull. Linus ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: nfsd changes for 3.6 @ 2012-07-31 21:54 ` Linus Torvalds 0 siblings, 0 replies; 6+ messages in thread From: Linus Torvalds @ 2012-07-31 21:54 UTC (permalink / raw) To: J. Bruce Fields Cc: linux-nfs-u79uwXL29TY76Z2rM5mHXA, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn, matthew-Ztpu424NOJ8 On Tue, Jul 31, 2012 at 7:36 AM, J. Bruce Fields <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> wrote: > > By the way, for a few years now I've been semi-regularly picking up > locks.c changes for my tree. I wonder if I should be. I really wish you didn't. Or at least not this way. For example, now you removed that lm_release_private case, but you did that without apparently talking to any VFS maintainers. And the commit seems to be pure shit. Why is it pure shit? Look at what users are left. THERE ARE NO USERS THAT SET THAT FIELD ANY MORE! Maybe I missed some odd user that somehow avoids the grep, but I don't think so. So there is nothing that ever sets it, why the hell does the thing still remain at all? So if this is a real bugfix, then I think it damn well should (a) at a minimum have been discussed with VFS maintainers (b) have been thought through a bit more (ie remove all remains of that now useless lm_release_private field) (c) likely never have gone through the NFSD tree in any case. I've pulled the changes for now, but I absolutely *detest* seeing things like this. I care very little about the nfsd code, but I care deeply when I see insanity happening in the VFS layer. And right now, "lm_release_private" is insane as of this pull. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] locks: remove unused lm_release_private 2012-07-31 21:54 ` Linus Torvalds (?) @ 2012-08-01 11:56 ` J. Bruce Fields -1 siblings, 0 replies; 6+ messages in thread From: J. Bruce Fields @ 2012-08-01 11:56 UTC (permalink / raw) To: Linus Torvalds; +Cc: linux-nfs, linux-fsdevel, linux-kernel, viro, matthew From: "J. Bruce Fields" <bfields@redhat.com> 3b6e2723f32de42028617f2c99b244ccd72cd959 "locks: prevent side-effects of locks_release_private before file_lock is initialized" removed the last user of lm_release_private without removing the field itself. Signed-off-by: J. Bruce Fields <bfields@redhat.com> --- Documentation/filesystems/Locking | 2 -- fs/locks.c | 6 +----- include/linux/fs.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) On Tue, Jul 31, 2012 at 02:54:05PM -0700, Linus Torvalds wrote: > Maybe I missed some odd user that somehow avoids the grep, but I don't > think so. So there is nothing that ever sets it, why the hell does the > thing still remain at all? Embarassingly: I had work in progress that could make use of lm_release_private soon, so I didn't bother removing it. But "soon" was optimistic, and anyway why leave the code in a confusing state, so: agreed it should have gone, apologies. --b. diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 8e2da1e..f11d51f 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking @@ -343,7 +343,6 @@ prototypes: int (*lm_compare_owner)(struct file_lock *, struct file_lock *); void (*lm_notify)(struct file_lock *); /* unblock callback */ int (*lm_grant)(struct file_lock *, struct file_lock *, int); - void (*lm_release_private)(struct file_lock *); void (*lm_break)(struct file_lock *); /* break_lease callback */ int (*lm_change)(struct file_lock **, int); @@ -352,7 +351,6 @@ locking rules: lm_compare_owner: yes no lm_notify: yes no lm_grant: no no -lm_release_private: maybe no lm_break: yes no lm_change yes no diff --git a/fs/locks.c b/fs/locks.c index 541075a..5cf874c 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -200,11 +200,7 @@ void locks_release_private(struct file_lock *fl) fl->fl_ops->fl_release_private(fl); fl->fl_ops = NULL; } - if (fl->fl_lmops) { - if (fl->fl_lmops->lm_release_private) - fl->fl_lmops->lm_release_private(fl); - fl->fl_lmops = NULL; - } + fl->fl_lmops = NULL; } EXPORT_SYMBOL_GPL(locks_release_private); diff --git a/include/linux/fs.h b/include/linux/fs.h index a1e7727..9a6ac61 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1154,7 +1154,6 @@ struct lock_manager_operations { int (*lm_compare_owner)(struct file_lock *, struct file_lock *); void (*lm_notify)(struct file_lock *); /* unblock callback */ int (*lm_grant)(struct file_lock *, struct file_lock *, int); - void (*lm_release_private)(struct file_lock *); void (*lm_break)(struct file_lock *); int (*lm_change)(struct file_lock **, int); }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-08-01 11:56 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-07-31 14:29 nfsd changes for 3.6 J. Bruce Fields 2012-07-31 14:29 ` J. Bruce Fields 2012-07-31 14:36 ` J. Bruce Fields 2012-07-31 21:54 ` Linus Torvalds 2012-07-31 21:54 ` Linus Torvalds 2012-08-01 11:56 ` [PATCH] locks: remove unused lm_release_private J. Bruce Fields
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.