|
@@ -217,11 +217,7 @@ void fh_put(struct svc_fh *);
|
|
|
static __inline__ struct svc_fh *
|
|
|
fh_copy(struct svc_fh *dst, struct svc_fh *src)
|
|
|
{
|
|
|
- if (src->fh_dentry || src->fh_locked) {
|
|
|
- struct dentry *dentry = src->fh_dentry;
|
|
|
- printk(KERN_ERR "fh_copy: copying %s/%s, already verified!\n",
|
|
|
- dentry->d_parent->d_name.name, dentry->d_name.name);
|
|
|
- }
|
|
|
+ WARN_ON(src->fh_dentry || src->fh_locked);
|
|
|
|
|
|
*dst = *src;
|
|
|
return dst;
|
|
@@ -300,10 +296,8 @@ fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
|
|
|
dfprintk(FILEOP, "nfsd: fh_lock(%s) locked = %d\n",
|
|
|
SVCFH_fmt(fhp), fhp->fh_locked);
|
|
|
|
|
|
- if (!fhp->fh_dentry) {
|
|
|
- printk(KERN_ERR "fh_lock: fh not verified!\n");
|
|
|
- return;
|
|
|
- }
|
|
|
+ BUG_ON(!dentry);
|
|
|
+
|
|
|
if (fhp->fh_locked) {
|
|
|
printk(KERN_WARNING "fh_lock: %s/%s already locked!\n",
|
|
|
dentry->d_parent->d_name.name, dentry->d_name.name);
|
|
@@ -328,8 +322,7 @@ fh_lock(struct svc_fh *fhp)
|
|
|
static inline void
|
|
|
fh_unlock(struct svc_fh *fhp)
|
|
|
{
|
|
|
- if (!fhp->fh_dentry)
|
|
|
- printk(KERN_ERR "fh_unlock: fh not verified!\n");
|
|
|
+ BUG_ON(!fhp->fh_dentry);
|
|
|
|
|
|
if (fhp->fh_locked) {
|
|
|
fill_post_wcc(fhp);
|