From: adilger <adilger>
Date: Thu, 14 Jul 2005 17:17:31 +0000 (+0000)
Subject: Branch b1_4
X-Git-Tag: v1_7_140~1^12~3^2~55^5~87
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=699662f146cb8603fa3917e8ba98c79165e20d78;p=fs%2Flustre-release.git

Branch b1_4
Fix patch mismerge.
b=7122
---

diff --git a/lustre/kernel_patches/patches/nfs_export_kernel-2.4.20-hp.patch b/lustre/kernel_patches/patches/nfs_export_kernel-2.4.20-hp.patch
index 52ea4e1..13c7cd7 100644
--- a/lustre/kernel_patches/patches/nfs_export_kernel-2.4.20-hp.patch
+++ b/lustre/kernel_patches/patches/nfs_export_kernel-2.4.20-hp.patch
@@ -415,13 +415,13 @@
  /*
   * Look up one component of a pathname.
   * N.B. After this call _both_ fhp and resfh need an fh_put
-@@ -300,7 +422,10 @@ nfsd_setattr(struct svc_rqst *rqstp, str
+@@ -300,7 +422,12 @@ nfsd_setattr(struct svc_rqst *rqstp, str
  	}
  	err = nfserr_notsync;
  	if (!check_guard || guardtime == inode->i_ctime) {
 -		err = notify_change(dentry, iap);
 +		if (dentry->d_inode->i_op &&dentry->d_inode->i_op->setattr_raw){
-+			if (acc_mode & MAY_OWNER_OVERRIDE)
++			if (accmode & MAY_OWNER_OVERRIDE)
 +				iap->ia_valid & O_OWNER_OVERRIDE;
 +			err = setattr_raw(dentry->d_inode, iap);
 +		} else